MDL-82931 mod_data: Harden parsing of content format

PhMemmel · Nov 20, 2024 · 5de5498 · 5de5498
1 parent 269a8a8
commit 5de5498
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -512,7 +512,6 @@ protected function get_data_content(int $recordid) {
      * @return bool|string
      */
     function display_browse_field($recordid, $template) {
-        global $DB;
         $content = $this->get_data_content($recordid);
         if (!$content || !isset($content->content)) {
             return '';
@@ -523,7 +522,8 @@ function display_browse_field($recordid, $template) {
             $options->filter = false;
         }
         $options->para = false;
-        $str = format_text($content->content, $content->content1, $options);
+        $format = !empty($content->content1) && !empty(trim($content->content1)) ? $content->content1 : null;
+        $str = format_text($content->content, $format, $options);
         return $str;
     }