moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-68867 calendar: remove dependency on USER->groupmember hack

Browse source
This commit is contained in:
Simey Lameze 2022-06-14 10:51:30 +08:00
parent b81fb00f25
commit 24cd968683
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
calendar/lib.php
View file

@ -2158,11 +2158,7 @@ function calendar_set_filters(array $courseeventsfrom, $ignorefilters = false, s
} else if ($isvaliduser) { } else if ($isvaliduser) {
$groupids = array(); $groupids = array();
foreach ($courseeventsfrom as $courseid => $course) { foreach ($courseeventsfrom as $courseid => $course) {
// If the user is an editing teacher in there. if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
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 this course has groups, show events from all of those related to the current user. // 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); $coursegroups = groups_get_user_groups($course->id, $user->id);
$groupids = array_merge($groupids, $coursegroups['0']); $groupids = array_merge($groupids, $coursegroups['0']);