fix #3450 @0.25

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index d5866d9cf43334a6f68539713b0bde599c693e45..27bad914f0a10e4c2b27abe13923576a402e9f53 100644 (file)
--- 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 efded0ffeffed5e562733da3184145cfac91413c..6bba1ad1c8b91a154cc7eefec7c38b1be3e2d6d7 100644 (file)
--- 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;
                     }