MDL-55229 course: Handle invisible course categories

moodle · Aug 10, 2016 · 369856e · 369856e
1 parent 56394c8
commit 369856e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/course/externallib.php b/course/externallib.php
@@ -2235,8 +2235,8 @@ public static function search_courses($criterianame,
             $coursecontext = context_course::instance($course->id);
 
             // Category information.
-            if (!isset($categoriescache[$course->category])) {
-                $categoriescache[$course->category] = coursecat::get($course->category);
+            if (!array_key_exists($course->category, $categoriescache)) {
+                $categoriescache[$course->category] = coursecat::get($course->category, IGNORE_MISSING);
             }
             $category = $categoriescache[$course->category];
 
@@ -2281,7 +2281,7 @@ public static function search_courses($criterianame,
             $coursereturns['displayname']       = external_format_string($displayname, $coursecontext->id);
             $coursereturns['shortname']         = external_format_string($course->shortname, $coursecontext->id);
             $coursereturns['categoryid']        = $course->category;
-            $coursereturns['categoryname']      = $category->name;
+            $coursereturns['categoryname']      = $category == null ? '' : $category->name;
             $coursereturns['summary']           = $summary;
             $coursereturns['summaryformat']     = $summaryformat;
             $coursereturns['overviewfiles']     = $files;