From 1f60d5198d418b667526bfa8c8f1f7ace211eaef Mon Sep 17 00:00:00 2001
From: Philipp Memmel <philipp.memmel@gmail.com>
Date: Thu, 29 Aug 2024 07:21:37 +0200
Subject: [PATCH] MDL-82931 mod_data: Harden parsing of content format

---
 mod/data/lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 9e0af83ba39..bea2c79aff1 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -512,7 +512,6 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
      * @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 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
             $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;
     }