(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 52cfb2257c5d4564d1aed5d87a57e72de9a8f305..00785ddefa3df76fd044f04e9310e33ba37afbc5 100644 (file)
--- 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 . '/');\r
        }\r
        define('CONVERTER_PATH', ROOT . '/tools/');\r
+       define('MXMLC_PATH','C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');\r
        define('FTPROOT','/');\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
@@ -38,6 +39,7 @@ if (in_array($_SERVER['HTTP_HOST'], array_merge($localrel, $localabs))) {
        define('DEV', false);\r
        define('WINDOWS', false);\r
        define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');\r
+       define('MXMLC_PATH','/usr/local/bin/mxmlc');\r
        define('AS3_SOURCES','/home/ws/sources');\r
 }\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 764c8682d086bee8bcacf52270fcaa0d88e01439..a406c5a6dfbb57a77bbf61c910f511833a1cf3bf 100644 (file)
--- 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);\r
                $theme = $daoTheme->getThemeOfBook(2963);\r
 \r
-               $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES));\r
+               $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES),MXMLC_PATH);\r
                $flex->addVariable('links', $book->links);\r
                $flex->addVariable('datas', $book->parametres->toStandardObject());\r
                $flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));\r

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 5bd6ac9f8505a6090d2f9fe565cec9b47bd53aea..bb8f03a5a88427aacc816729b275183aadb21a39 100644 (file)
--- 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');\r
 \r
                if (in_array($varname, $classic)) {\r
-                       if (is_array($this->$varname)) {\r
+                       if (is_array($this->$varname) || is_object($this->$varname)) {\r
                                return $this->$varname;\r
                        }\r
                        if ($this->$varname == '') {\r