(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 58e3468844eff6e653dc3f473a96b40ed2168f30..0709e3bf8c14004e1220f090a8fbc6637b15e2be 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -1094,7 +1094,7 @@ class wsAjax extends cubeAjax {
                $c->insert();\r
 \r
                if ($_GET['ctrl']) {\r
-                       self::collectionVersionPublish(array('', $id, $time, 'android'), $x);\r
+                       self::collectionVersionPublish(array('', $id, $time, 'ios'), $x);\r
                }\r
 \r
                $x->addReload();\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index d7dbef522468a789a441bc9ac02553b3486f96e1..3ffd6724dabcb42cbad52808cbc7b1565a03793e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -707,7 +707,7 @@ class wsServices extends cubeFlashGateway {
        protected function _getManifest($publications, $dir, $books, $resolution) {\r
                global $core;\r
                $res = array();\r
-               $res['manifest'] = array('assetRoot' => 'http://workshop.fluidbook.com' . $dir . '/', 'autoDownload' => true);\r
+               $res['manifest'] = array('assetRoot' => 'http://workshop.fluidbook.com' . $dir . '/', 'autoDownload' => false);\r
                $res['manifestPub'] = array();\r
 \r
                $bundles = array();\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 6ba01208785a4a6d0a03c2e381215fdd06f1d8b5..58388934b0855ecdbee748c227c4c15ac556cc5f 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -510,7 +510,7 @@ class wsHTML5Compiler {
                }
 
                $scripts = array();
-               $scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_' . $this->book_id . '"></script>';
+               //$scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_' . $this->book_id . '"></script>';
                foreach ($this->debugJsFiles as $js) {
                        $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }