]> _ Git - cubeextranet.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 8 Jul 2011 22:25:50 +0000 (22:25 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 8 Jul 2011 22:25:50 +0000 (22:25 +0000)
inc/ws/Util/packager/class.ws.packager.html5.php

index 8b9f04207e387a120319de49041597fc1516282b..f27754d5e97e0b1f405c3b91b6e05c43a427cff3 100644 (file)
@@ -71,11 +71,9 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function writeConfig() {\r
-               $res = 'DATAS=' . json_encode($this->book->parametres->toStandardObject()) . ';' . "\n";\r
-               $res.= 'THEME=' . json_encode($this->theme->parametres->toStandardObject()) . ';' . "\n";\r
-               $res.= 'ID=' . $this->book->book_id . ';' . "\n";\r
-\r
-               return $res;\r
+               $config = cubeObject::merge($this->book->parametres->toStandardObject(), $this->theme->parametres->toStandardObject());\r
+               $config->id = $this->book->book_id;\r
+               return 'DATAS=' . json_encode($config) . ';';\r
        }\r
 \r
        protected function writeFonts() {\r