mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 11:23:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-82931-main' of https://github.com/PhMemmel/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-11-28 09:43:30 +07:00
commit d3a0d5c6cb
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
1 changed files with 2 additions and 2 deletions

4
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;
}