From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 8 Jun 2020 14:51:28 +0000 (+0000)
Subject: done #3689 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=01ba88fc447055eee6264a804d7e01b5c7e20a25;p=cubeextranet.git

done #3689 @1.5
---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 68544929a..fc277ea1a 100644
--- 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 a6e8e9aa9..111ebe66f 100644
--- 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 b924e7db8..c19c81eee 100644
--- 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;
         }