L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-82931 mod_data: Harden parsing of content format

Browse Source
This commit is contained in:
Philipp Memmel
2024-11-20 21:23:02 +01:00
parent e1d05182a6
commit 1f60d5198d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/lib.php
+2 -2
View File
@@ -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;
}