MDL-45057 mod_quiz: restored the user/group override deleted events

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 5513e80..ffe7e54 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -191,6 +191,11 @@ function quiz_delete_instance($id) {
 function quiz_delete_override($quiz, $overrideid) {
     global $DB;
 
+    if (!isset($quiz->cmid)) {
+        $cm = get_coursemodule_from_instance('quiz', $quiz->id, $quiz->course);
+        $quiz->cmid = $cm->id;
+    }
+
     $override = $DB->get_record('quiz_overrides', array('id' => $overrideid), '*', MUST_EXIST);
 
     // Delete the events.
@@ -204,7 +209,6 @@ function quiz_delete_override($quiz, $overrideid) {
 
     $DB->delete_records('quiz_overrides', array('id' => $overrideid));
 
-    /* TODO MDL-45057 - Restore this event firing.
     // Set the common parameters for one of the events we will be triggering.
     $params = array(
         'objectid' => $override->id,
@@ -225,7 +229,6 @@ function quiz_delete_override($quiz, $overrideid) {
     // Trigger the override deleted event.
     $event->add_record_snapshot('quiz_overrides', $override);
     $event->trigger();
-    */
 
     return true;
 }

diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
index ec841ae..1f26b63 100644 (file)
--- a/mod/quiz/overridedelete.php
+++ b/mod/quiz/overridedelete.php
@@ -61,6 +61,8 @@ if (!empty($override->userid)) {
 if ($confirm) {
     require_sesskey();
 
+    // Set the course module id before calling quiz_delete_override().
+    $quiz->cmid = $cm->id;
     quiz_delete_override($quiz, $override->id);
 
     redirect($cancelurl);

diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php
index 8dc7fa2..ec09cf3 100644 (file)
--- a/mod/quiz/overrideedit.php
+++ b/mod/quiz/overrideedit.php
@@ -155,6 +155,8 @@ if ($mform->is_cancelled()) {
                     $fromform->{$key} = $oldoverride->{$key};
                 }
             }
+            // Set the course module id before calling quiz_delete_override().
+            $quiz->cmid = $cm->id;
             quiz_delete_override($quiz, $oldoverride->id);
         }
     }

diff --git a/mod/quiz/tests/events_test.php b/mod/quiz/tests/events_test.php
index ab1e0a1..bad32a0 100644 (file)
--- a/mod/quiz/tests/events_test.php
+++ b/mod/quiz/tests/events_test.php
@@ -560,9 +560,6 @@ class mod_quiz_events_testcase extends advanced_testcase {
     public function test_user_override_deleted() {
         global $DB;
 
-        // TODO: this test is temporarily disabled (MDL-45057).
-        return false;
-
         $this->resetAfterTest();
 
         $this->setAdminUser();
@@ -595,9 +592,6 @@ class mod_quiz_events_testcase extends advanced_testcase {
     public function test_group_override_deleted() {
         global $DB;
 
-        // TODO: this test is temporarily disabled (MDL-45057).
-        return false;
-
         $this->resetAfterTest();
 
         $this->setAdminUser();