From 99618f89bfa9b2694c837b7073e96864e9cea5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20B=C3=B6sch?= Date: Tue, 21 Nov 2017 08:33:25 +0100 Subject: [PATCH] MDL-27230 quiz: remove and update group overrides in calendar --- mod/quiz/lib.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 9b2b227b8ff..209c31850f5 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -225,9 +225,16 @@ function quiz_delete_override($quiz, $overrideid) { $override = $DB->get_record('quiz_overrides', array('id' => $overrideid), '*', MUST_EXIST); // Delete the events. - $events = $DB->get_records('event', array('modulename' => 'quiz', - 'instance' => $quiz->id, 'groupid' => (int)$override->groupid, - 'userid' => (int)$override->userid)); + if (isset($override->groupid)) { + // Create the search array for a group override. + $eventsearcharray = array('modulename' => 'quiz', + 'instance' => $quiz->id, 'groupid' => (int)$override->groupid); + } else { + // Create the search array for a user override. + $eventsearcharray = array('modulename' => 'quiz', + 'instance' => $quiz->id, 'userid' => (int)$override->userid); + } + $events = $DB->get_records('event', $eventsearcharray); foreach ($events as $event) { $eventold = calendar_event::load($event); $eventold->delete();