making get_my_courses() respect $limit

diff --git a/lib/datalib.php b/lib/datalib.php
index 68e8259138a267eccd35277b55017e76799b9856..e69968ed7d30153ee6b07e9ade7609bee2375782 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -703,7 +703,11 @@ function get_my_courses($userid, $sort=NULL, $fields=NULL, $doanything=false,$li
     // If using default params, we may have it cached...
     if (!empty($USER->id) && ($USER->id == $userid) && $usingdefaults) {
         if (!empty($USER->mycourses[$doanything])) {
-            return $USER->mycourses[$doanything];
+            if ($limit && $limit < count($USER->mycourses[$doanything])) {
+                return array_slice($USER->mycourses[$doanything], 0, $limit, true);
+            } else {
+                return $USER->mycourses[$doanything];
+            }
         }
     }
 
@@ -761,11 +765,11 @@ function get_my_courses($userid, $sort=NULL, $fields=NULL, $doanything=false,$li
                     c.id
                 FROM 
                     {$CFG->prefix}role_assignments ra
-                    INNER JOIN {$CFG->prefix}context x           ON x.id         = ra.contextid
+                    INNER JOIN {$CFG->prefix}context x ON x.id = ra.contextid
                     INNER JOIN {$CFG->prefix}course_categories a ON a.path LIKE ".sql_concat("'%/'", 'x.instanceid', "'/%'")." OR x.instanceid = a.id
-                    INNER JOIN {$CFG->prefix}course c            ON c.category   = a.id
+                    INNER JOIN {$CFG->prefix}course c ON c.category = a.id
                 WHERE 
-                    ra.userid      = $userid AND
+                    ra.userid = $userid AND
                     x.contextlevel = 40
                 UNION
                 SELECT
@@ -816,7 +820,7 @@ function get_my_courses($userid, $sort=NULL, $fields=NULL, $doanything=false,$li
     }
 
     // Cache if using default params...
-    if (!empty($USER->id) && ($USER->id == $userid) && $usingdefaults) {
+    if (!empty($USER->id) && ($USER->id == $userid) && $usingdefaults && $limit == 0) {
         $USER->mycourses[$doanything] = $mycourses;
     }
     return $mycourses;