From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 2 Mar 2020 11:20:31 +0000 (+0000)
Subject: fix #3450 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=326190bb588b8bfa2a310cc2f3b5830d8fd4f777;p=cubeextranet.git

fix #3450 @0.25
---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index d5866d9cf..27bad914f 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -1461,7 +1461,7 @@ class commonTools
         $template = new ZipArchive();
         $template->open($temp);
 
-        $data = simplexml_load_string($uploaded->getFromName('data.xml'));
+        $data = simplexml_load_string($uploaded->getFromName('data.xml'), "SimpleXMLElement", LIBXML_NOERROR |  LIBXML_ERR_NONE);
         $quizTitle = (string)$data->xpath('/quiz/title')[0];
 
         // Replace assets
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 efded0ffe..6bba1ad1c 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1276,8 +1276,10 @@ class wsHTML5Compiler
                         if ($v === '') {
                             continue;
                         }
-                        if ($this->book->parametres->tabsPagesNumbers === 'virtual') {
-                            $v = $this->virtualToPhysical($v);
+                        if ($v !== '-') {
+                            if ($this->book->parametres->tabsPagesNumbers === 'virtual') {
+                                $v = $this->virtualToPhysical($v);
+                            }
                         }
                         $list[] = $v;
                     }