From 81cc8046c407df1aeec1d6f8a50bc36e127dbbb9 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sat, 21 Oct 2006 16:36:31 +0000
Subject: [PATCH] Merged My Courses fixes from stable

---
 blocks/course_list/block_course_list.php | 2 +-
 lib/datalib.php                          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index 5bd473eeae..e2e3752a5c 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -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) {
diff --git a/lib/datalib.php b/lib/datalib.php
index 4e3f12f799..8fbefbac2a 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -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;
                 }
-- 
2.39.5