From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 Sep 2013 19:02:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dcc4d7799fbc55e10976b2c3704e6d28c3117e50;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c48b754fe..ea96ed2f1 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -733,7 +733,7 @@ class wsUrl {
 		$formats = array('ttf', 'otf', 'TTF', 'OTF');
 
 		$dr = opendir(FONT_PATH);
-		$fonts = array();
+		$fonts = array('Arial (police système)' => "system");
 		while ($file = readdir($dr)) {
 			if ($file == '.' || $file == '..' || !in_array(files::getExtension($file), $formats)) {
 				continue;
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 9c4b3796b..32ff719e3 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1338,8 +1338,10 @@ class wsDAOBook extends commonDAO {
 		}
 		// Fonts
 		if ($theme->parametres->fontKit == 'auto') {
-			$flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);
-			$flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
+			if ($lang->font != 'system') {
+				$flex->addFont(FONT_PATH . '/' . $lang->font, 'BoldFont', $lang->charset);
+				$flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
+			}
 			$flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
 			$flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');
 		} else if ($theme->parametres->fontKit == 'vagrounded') {