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

Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle

Browse source
This commit is contained in:
David Monllao 2018-01-15 12:10:20 +01:00
commit 2692af9032
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
calendar/classes/local/event/container.php
View file

@ -151,11 +151,16 @@ class container {
// 2) Only process modules for courses a user has the capability to view OR they are enrolled in. // 2) Only process modules for courses a user has the capability to view OR they are enrolled in.
// 3) Only process modules for courses that are visible OR if the course is not visible, the user // 3) Only process modules for courses that are visible OR if the course is not visible, the user
// has the capability to view hidden courses. // has the capability to view hidden courses.
if (!$cm->uservisible) {
return true;
}
$coursecontext = \context_course::instance($dbrow->courseid); $coursecontext = \context_course::instance($dbrow->courseid);
$canseecourse = has_capability('moodle/course:view', $coursecontext) || is_enrolled($coursecontext); if (!$cm->get_course()->visible && !has_capability('moodle/course:viewhiddencourses', $coursecontext)) {
$canseecourse = $canseecourse && return true;
($cm->get_course()->visible || has_capability('moodle/course:viewhiddencourses', $coursecontext)); }
if (!$cm->uservisible || !$canseecourse) {
if (!has_capability('moodle/course:view', $coursecontext) && !is_enrolled($coursecontext)) {
return true; return true;
} }