Merged My Courses fixes from stable

diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index 5bd473eeae117ce689b4cce31a8b7a91e7bdc241..e2e3752a5c11eaed997f752dca96566ff81061e2 100644 (file)
--- 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 4e3f12f799331d58e202e9790385ec7e0ed2a362..8fbefbac2a8b4f5b3ded77a05927d41587e85c77 100644 (file)
--- 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;
                 }