Merge branch 'MDL-55955_32' of git://github.com/markn86/moodle into M…

…OODLE_32_STABLE
moodle · Dec 28, 2016 · cd9a925 · cd9a925
2 parents 40471ed + 522fcf2
commit cd9a925
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
@@ -1194,8 +1194,11 @@ function quiz_update_events($quiz, $override = null) {
                    'instance'=>$quiz->id);
     if (!empty($override)) {
         // Only load events for this override.
-        $conds['groupid'] = isset($override->groupid)?  $override->groupid : 0;
-        $conds['userid'] = isset($override->userid)?  $override->userid : 0;
+        if (isset($override->userid)) {
+            $conds['userid'] = $override->userid;
+        } else if (isset($override->groupid)) {
+            $conds['groupid'] = $override->groupid;
+        }
     }
     $oldevents = $DB->get_records('event', $conds);