Merged My Courses fixes from stable

This commit is contained in:
moodler
2006-10-21 16:36:31 +00:00
parent 04c9f8dcc2
commit 81cc8046c4
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ class block_course_list extends block_list {
if (empty($CFG->disablemycourses) and
!empty($USER->id) and
!(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM, SITEID)) and $adminseesall)and
!(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall) and
!isguest()) { // Just print My Courses
if ($courses = get_my_courses($USER->id)) {
foreach ($courses as $course) {
+2 -1
View File
@@ -674,7 +674,8 @@ function get_my_courses($userid, $sort='visible DESC,sortorder ASC', $fields='*'
// the course needs to be visible, or user must have moodle/course:viewhiddencourses
// capability set to view hidden courses
$context = get_context_instance(CONTEXT_COURSE, $course->id);
if (has_capability('moodle/course:view', $context, $userid) &&
if ( has_capability('moodle/course:view', $context, $userid, false) &&
!has_capability('moodle/legacy:guest', $context, $userid, false) &&
($course->visible || has_capability('moodle/course:viewhiddencourses', $context, $userid))) {
$mycourses[$course->id] = $course;
}