From 492bac151db284779568eb31276bd267b3d3a42f Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Fri, 29 Jul 2022 12:34:41 +0200 Subject: [PATCH] MDL-75285 core_reportbuilder: allow left joins on category entity --- course/classes/local/entities/course_category.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/course/classes/local/entities/course_category.php b/course/classes/local/entities/course_category.php index 6c923b0058a..a3510f081ad 100644 --- a/course/classes/local/entities/course_category.php +++ b/course/classes/local/entities/course_category.php @@ -97,8 +97,9 @@ class course_category extends base { ->add_joins($this->get_joins()) ->set_type(column::TYPE_TEXT) ->add_fields("{$tablealias}.name, {$tablealias}.id") - ->add_callback(static function(string $name, stdClass $category): string { - return core_course_category::get($category->id, MUST_EXIST, true)->get_formatted_name(); + ->add_callback(static function(?string $name, stdClass $category): string { + return empty($category->id) ? '' : + core_course_category::get($category->id, MUST_EXIST, true)->get_formatted_name(); }) ->set_is_sortable(true); @@ -111,8 +112,9 @@ class course_category extends base { ->add_joins($this->get_joins()) ->set_type(column::TYPE_TEXT) ->add_fields("{$tablealias}.name, {$tablealias}.id") - ->add_callback(static function(string $name, stdClass $category): string { - return core_course_category::get($category->id, MUST_EXIST, true)->get_nested_name(false); + ->add_callback(static function(?string $name, stdClass $category): string { + return empty($category->id) ? '' : + core_course_category::get($category->id, MUST_EXIST, true)->get_nested_name(false); }) ->set_disabled_aggregation(['groupconcat', 'groupconcatdistinct']) ->set_is_sortable(true);