Merge branch 'MDL-33441-22' of git://github.com/danpoltawski/moodle into MOODLE_22_STABLE

2012-06-06 10:09:54 +12:00
parent 928a51ad3d 20253ec57b
commit 46d433f701
1 changed files with 5 additions and 0 deletions
@@ -2091,6 +2091,11 @@ function get_course_category_tree($id = 0, $depth = 0) {
        return array($categories, $categoryids);
    }

+    if (empty($categoryids)) {
+        // No categories available (probably all hidden).
+        return array();
+    }
+
    // The depth is 0 this function has just been called so we can finish it off

    list($ccselect, $ccjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');