Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle

2016-12-28 21:19:03 +00:00
parent 16cfeccad8 cc4fba8636
commit 398e8fa1ed
1 changed files with 5 additions and 2 deletions
@@ -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 {
+            $conds['groupid'] = $override->groupid;
+        }
    }
    $oldevents = $DB->get_records('event', $conds);