Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle

sbourget · May 30, 2016 · 7c8f4f6 · 7c8f4f6
2 parents 485de12 + 9a601ad
commit 7c8f4f6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/question/type/multianswer/backup/moodle2/restore_qtype_multianswer_plugin.class.php b/question/type/multianswer/backup/moodle2/restore_qtype_multianswer_plugin.class.php
@@ -102,7 +102,11 @@ public function after_execute_question() {
                    AND bi.itemname = 'question_created'",
                 array($this->get_restoreid()));
         foreach ($rs as $rec) {
-            $sequencearr = explode(',', $rec->sequence);
+            $sequencearr = preg_split('/,/', $rec->sequence, -1, PREG_SPLIT_NO_EMPTY);
+            if (substr_count($rec->sequence, ',') + 1 != count($sequencearr)) {
+                $this->task->log('Invalid sequence found in restored multianswer question ' . $rec->id, backup::LOG_WARNING);
+            }
+
             foreach ($sequencearr as $key => $question) {
                 $sequencearr[$key] = $this->get_mappingid('question', $question);
             }