MDL-14750 - followup - make the code robust in the case their are broken questions...

diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index 60238976dbb81de5dddf6f37773aa45a93d2d888..eb3abaf2573713c7050f429575891f59329a3465 100644 (file)
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -52,9 +52,11 @@ function question_multianswer_fix_subquestion_parents_and_categories() {
             'question q JOIN ' . $CFG->prefix . 'question_multianswer qma ON q.id = qma.question');
     if ($rs) {
         while ($q = rs_fetch_next_record($rs)) {
-            $result = $result && execute_sql('UPDATE ' . $CFG->prefix . 'question' .
-                       ' SET parent = ' . $q->id . ', category = ' . $q->category .
-                       ' WHERE id IN (' . $q->sequence . ') AND parent <> 0');
+            if (!empty($q->sequence)) {
+                $result = $result && execute_sql('UPDATE ' . $CFG->prefix . 'question' .
+                        ' SET parent = ' . $q->id . ', category = ' . $q->category .
+                        ' WHERE id IN (' . $q->sequence . ') AND parent <> 0');
+            }
         }
         rs_close($rs);
     } else {