From ceb0505b5b938fc4d89d0f731194f51c27249c55 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Dec 2011 01:51:46 +0100 Subject: [PATCH] New: Tuffy font is no more required. --- htdocs/includes/artichow/Artichow.cfg.php | 8 ++++---- htdocs/includes/artichow/php5/AntiSpam.class.php | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/includes/artichow/Artichow.cfg.php b/htdocs/includes/artichow/Artichow.cfg.php index 7894a943303..ea4b91c9b2f 100644 --- a/htdocs/includes/artichow/Artichow.cfg.php +++ b/htdocs/includes/artichow/Artichow.cfg.php @@ -73,10 +73,10 @@ define('ARTICHOW_DEPRECATED', TRUE); // DOL_CHANGE LDR if (defined('ARTICHOW_FONT_NAMES')) $fonts=explode(',',constant('ARTICHOW_FONT_NAMES')); else $fonts = array( - 'Tuffy', - 'TuffyBold', - 'TuffyBoldItalic', - 'TuffyItalic' + 'Aerial', + 'AerialBd', + 'AerialBdIt', + 'AerialIt' ); global $artichow_defaultfont; $artichow_defaultfont=$fonts[0]; diff --git a/htdocs/includes/artichow/php5/AntiSpam.class.php b/htdocs/includes/artichow/php5/AntiSpam.class.php index 0d06b2c2b3b..b0dd33de64c 100644 --- a/htdocs/includes/artichow/php5/AntiSpam.class.php +++ b/htdocs/includes/artichow/php5/AntiSpam.class.php @@ -122,11 +122,12 @@ class awAntiSpam extends awImage { */ public function draw() { + // We redefine $fonts here because we need a full path to font $fonts = array( - ARTICHOW_FONT.DIRECTORY_SEPARATOR.'Tuffy.ttf', - ARTICHOW_FONT.DIRECTORY_SEPARATOR.'TuffyBold.ttf', - ARTICHOW_FONT.DIRECTORY_SEPARATOR.'TuffyItalic.ttf', - ARTICHOW_FONT.DIRECTORY_SEPARATOR.'TuffyBoldItalic.ttf' + ARTICHOW_FONT.DIRECTORY_SEPARATOR.'Aerial.ttf', + ARTICHOW_FONT.DIRECTORY_SEPARATOR.'AerialBd.ttf', + ARTICHOW_FONT.DIRECTORY_SEPARATOR.'AerialBdIt.ttf', + ARTICHOW_FONT.DIRECTORY_SEPARATOR.'AerialIt.ttf' ); $sizes = array(12, 12.5, 13, 13.5, 14, 15, 16, 17, 18, 19);