From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 8 Jul 2010 14:56:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4cfe224d6cc046c661098553a63e765933bb1efb;p=cubeextranet.git

---

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 52cfb2257..00785ddef 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -24,6 +24,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 		define('SITE_PATH', WEBROOT . '/');
 	}
 	define('CONVERTER_PATH', ROOT . '/tools/');
+	define('MXMLC_PATH','C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');
 	define('FTPROOT','/');
 } else {
 	// Définition des variables dans l'environnement de production
@@ -38,6 +39,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
 	define('DEV', false);
 	define('WINDOWS', false);
 	define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');
+	define('MXMLC_PATH','/usr/local/bin/mxmlc');
 	define('AS3_SOURCES','/home/ws/sources');
 }
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 764c8682d..a406c5a6d 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -130,7 +130,7 @@ html{height:100%}' . "\n";
 		$daoTheme = new wsDAOTheme($core->con);
 		$theme = $daoTheme->getThemeOfBook(2963);
 
-		$flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES));
+		$flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES),MXMLC_PATH);
 		$flex->addVariable('links', $book->links);
 		$flex->addVariable('datas', $book->parametres->toStandardObject());
 		$flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));
diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 5bd6ac9f8..bb8f03a5a 100644
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -43,7 +43,7 @@ class wsBook extends cubeMetier {
 		$classic = array('chapters', 'links', 'rulers', 'traductions');
 
 		if (in_array($varname, $classic)) {
-			if (is_array($this->$varname)) {
+			if (is_array($this->$varname) || is_object($this->$varname)) {
 				return $this->$varname;
 			}
 			if ($this->$varname == '') {