MDL-8455 - merged from MOODLE_18_STABLE

diff --git a/course/lib.php b/course/lib.php
index 42314fa7272537397883370da18e247dcf772db0..8bcd7a358b1783ccee007531deb0080d1c54ed4b 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1743,7 +1743,7 @@ function print_courses($category, $hidesitecourse = false) {
 
     if (empty($category)) {
         $categories = get_categories(0);  // Parent = 0   ie top-level categories only
-        if (count($categories) == 1) {
+        if ($categories != null and count($categories) == 1) {
             $category   = array_shift($categories);
             $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
         } else {