From 326190bb588b8bfa2a310cc2f3b5830d8fd4f777 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 2 Mar 2020 11:20:31 +0000 Subject: [PATCH] fix #3450 @0.25 --- inc/commons/class.common.tools.php | 2 +- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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; } -- 2.39.5