Merge branch 'MDL-45321' of git://github.com/timhunt/moodle

2014-04-30 15:25:22 +08:00
parent 6776b3ffa0 9b38aca0ce
commit 46a7e1d23b
1 changed files with 8 additions and 0 deletions
@@ -588,6 +588,14 @@ function xmldb_quiz_upgrade($oldversion) {
                        continue;
                    }

+                    if ($questionid === '') {
+                        // This can happen as the result of old restore bugs.
+                        // There can be a missing number in the list of ids.
+                        // All we can do about this is ignore it, which is what
+                        // the quiz system used to do. See MDL-45321.
+                        continue;
+                    }
+
                    if (array_key_exists($questionid, $questionidtoslotrowid)) {
                        // Normal case. quiz_slots entry is present.
                        // Just need to add slot and page.