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

moodle · Mar 5, 2013 · ce91af8 · ce91af8
2 parents 810fb77 + 9fc29ee
commit ce91af8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
@@ -277,8 +277,11 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
 if ($remove && confirm_sesskey()) {
     // Remove a question from the quiz.
     // We require the user to have the 'use' capability on the question,
-    // so that then can add it back if they remove the wrong one by mistake.
-    quiz_require_question_use($remove);
+    // so that then can add it back if they remove the wrong one by mistake,
+    // but, if the question is missing, it can always be removed.
+    if ($DB->record_exists('question', array('id' => $remove))) {
+        quiz_require_question_use($remove);
+    }
     quiz_remove_question($quiz, $remove);
     quiz_delete_previews($quiz);
     quiz_update_sumgrades($quiz);