done #3689 @1.5

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 68544929a85b067e125e19bcc01a48ddb31e7aa1..fc277ea1aac10537b2fed715684bc690fff0f71e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1140,7 +1140,8 @@ html.tall{height:150%}' . "\n";
             exit;
         }
 
-        $dao->compile($book_id, 'html5', false, false, false, null, false);
+        $book->parametres->scorm_enable = false;
+        $dao->compile($book_id, 'html5', false, false, false, $book, false);
 
         $book_id = $e[0];
         $hash = $e[1];
@@ -1176,7 +1177,7 @@ html.tall{height:150%}' . "\n";
             }
         }
 
-        $dao->compile($book_id, 'html5');
+        $dao->compile($book_id, 'html5', false, false, false, $book);
         $time = TIME;
 
         if (count($e) == 2 || $e[2] <= $time - 10) {
@@ -1758,8 +1759,6 @@ html.tall{height:150%}' . "\n";
         $admin = wsDroits::admin();
 
 
-
-
         if ($admin) {
             $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit'], null, 'entreprises_ws');
         } else {

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index a6e8e9aa945063c35aaee95829944dbdb88b9b5b..111ebe66f6de7d05076afd60c7b7107a1c503c86 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -214,7 +214,7 @@ class wsHTML5Compiler
 
     public $_signature;
     /**
-     * @var wsHTML5SeolinksData
+     * @var wsHTML5Seo
      */
     public $seo = null;
 

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index b924e7db81aeb14c29f9b23c77f8bf2828b602f8..c19c81eee8ff58baa052f99a20542f8c846d4ebf 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -36,7 +36,6 @@ class wsPackagerHTML extends wsPackager
         if ($this->_disableScorm) {
             $this->book->parametres->scorm_enable = false;
         }
-
         if ($this->book->parametres->mobilefirstFluidbookId != '') {
             $this->book->parametres->alwaysHTML5 = true;
         }