From 24cd968683552e9dda99e0f0f7a220989572dde3 Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Tue, 14 Jun 2022 10:51:30 +0800 Subject: [PATCH] MDL-68867 calendar: remove dependency on USER->groupmember hack --- calendar/lib.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/calendar/lib.php b/calendar/lib.php index 87b0aa3d345..9bba24d5e2e 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -2158,11 +2158,7 @@ function calendar_set_filters(array $courseeventsfrom, $ignorefilters = false, s } else if ($isvaliduser) { $groupids = array(); foreach ($courseeventsfrom as $courseid => $course) { - // If the user is an editing teacher in there. - if (!empty($user->groupmember[$course->id])) { - // We've already cached the users groups for this course so we can just use that. - $groupids = array_merge($groupids, $user->groupmember[$course->id]); - } else if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) { + if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) { // If this course has groups, show events from all of those related to the current user. $coursegroups = groups_get_user_groups($course->id, $user->id); $groupids = array_merge($groupids, $coursegroups['0']);