Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle

ralferlebach · Jan 17, 2011 · bec662a · bec662a
2 parents 227d6da + 85b8f8d
commit bec662a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/blocks/course_overview/block_course_overview.php b/blocks/course_overview/block_course_overview.php
@@ -64,7 +64,7 @@ public function get_content() {
             $courses_limit = $courses_limit + 1;
         }
 
-        $courses = enrol_get_my_courses('id, shortname', 'visible DESC,sortorder ASC', $courses_limit);
+        $courses = enrol_get_my_courses('id, shortname, modinfo', 'visible DESC,sortorder ASC', $courses_limit);
         $site = get_site();
         $course = $site; //just in case we need the old global $course hack
 

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -3045,6 +3045,10 @@ function &get_fast_modinfo(&$course, $userid=0) {
         return $cache[$course->id];
     }
 
+    if (!property_exists($course, 'modinfo')) {
+        debugging('Coding problem - missing course modinfo property in get_fast_modinfo() call');
+    }
+
     if (empty($course->modinfo)) {
         // no modinfo yet - load it
         rebuild_course_cache($course->id);