MDL-74678 reportbuilder: Allow null in category description callback

Since category description is a nullable column, we need to allow null value in category description column callback in category entity
moodle · May 13, 2022 · c05e079 · c05e079
1 parent 0a3eedb
commit c05e079
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cohort/classes/local/entities/cohort.php b/cohort/classes/local/entities/cohort.php
@@ -132,10 +132,14 @@ protected function get_all_columns(): array {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_TEXT)
             ->add_fields("{$tablealias}.description, {$tablealias}.descriptionformat, {$tablealias}.id, {$tablealias}.contextid")
-            ->add_callback(static function(string $description, stdClass $cohort): string {
+            ->add_callback(static function(?string $description, stdClass $cohort): string {
                 global $CFG;
                 require_once("{$CFG->libdir}/filelib.php");
 
+                if ($description === null) {
+                    return '';
+                }
+
                 $description = file_rewrite_pluginfile_urls($description, 'pluginfile.php', $cohort->contextid, 'cohort',
                     'description', $cohort->id);
 

diff --git a/course/classes/local/entities/course_category.php b/course/classes/local/entities/course_category.php
@@ -141,10 +141,14 @@ protected function get_all_columns(): array {
                  AND {$tablealiascontext}.contextlevel = " . CONTEXT_COURSECAT)
             ->set_type(column::TYPE_TEXT)
             ->add_fields("{$tablealias}.description, {$tablealias}.descriptionformat, {$tablealiascontext}.id AS contextid")
-            ->add_callback(static function(string $description, stdClass $category): string {
+            ->add_callback(static function(?string $description, stdClass $category): string {
                 global $CFG;
                 require_once("{$CFG->libdir}/filelib.php");
 
+                if ($description === null) {
+                    return '';
+                }
+
                 $description = file_rewrite_pluginfile_urls($description, 'pluginfile.php', $category->contextid, 'coursecat',
                     'description', null);