Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

My Moodle: MDL-19089 Course limit for My Moodle not propperly obeyed.…

… Fixing so that it obeys mycoursesperpage and propperly displays '...'
  • Loading branch information...
commit e84a97b83cf75c5b6e0349d87b21346951a05fff 1 parent 92eaeca
ericmerrill authored
Showing with 15 additions and 2 deletions.
  1. +15 −2 my/index.php
View
17 my/index.php
@@ -66,13 +66,26 @@
// limits the number of courses showing up
$courses_limit = 21;
- if (!empty($CFG->mycoursesperpage)) {
+ if (isset($CFG->mycoursesperpage)) {
$courses_limit = $CFG->mycoursesperpage;
}
+
+ $morecourses = false;
+ if ($courses_limit > 0) {
+ $courses_limit = $courses_limit + 1;
+ }
+
$courses = get_my_courses($USER->id, 'visible DESC,sortorder ASC', '*', false, $courses_limit);
$site = get_site();
$course = $site; //just in case we need the old global $course hack
+ if (($courses_limit > 0) && (count($courses) >= $courses_limit)) {
+ //remove the 'marker' course that we retrieve just to see if we have more than $courses_limit
+ array_pop($courses);
+ $morecourses = true;
+ }
+
+
if (array_key_exists($site->id,$courses)) {
unset($courses[$site->id]);
}
@@ -92,7 +105,7 @@
}
// if more than 20 courses
- if (count($courses) > 20) {
+ if ($morecourses) {
echo '<br />...';
}
Please sign in to comment.
Something went wrong with that request. Please try again.