diff --git a/mod/forum/classes/local/exporters/author.php b/mod/forum/classes/local/exporters/author.php index 4ef65200fcc..17a3ceb8d5b 100644 --- a/mod/forum/classes/local/exporters/author.php +++ b/mod/forum/classes/local/exporters/author.php @@ -172,7 +172,7 @@ class author extends exporter { return [ 'id' => $group->id, - 'name' => $group->name, + 'name' => format_string($group->name, true, ['context' => $context]), 'urls' => [ 'image' => $imageurl ? $imageurl->out(false) : null, 'group' => $groupurl ? $groupurl->out(false) : null diff --git a/mod/forum/classes/local/exporters/discussion.php b/mod/forum/classes/local/exporters/discussion.php index 38cf2268089..8270d9fa378 100644 --- a/mod/forum/classes/local/exporters/discussion.php +++ b/mod/forum/classes/local/exporters/discussion.php @@ -174,7 +174,7 @@ class discussion extends exporter { // or if it's been deleted and the discussion record hasn't been updated. if ($group) { $groupdata = [ - 'name' => $group->name, + 'name' => format_string($group->name, true, ['context' => $this->related['context']]), 'urls' => [], ]; diff --git a/mod/forum/classes/post_form.php b/mod/forum/classes/post_form.php index 5e603e2be25..dc377af6096 100644 --- a/mod/forum/classes/post_form.php +++ b/mod/forum/classes/post_form.php @@ -174,7 +174,7 @@ class mod_forum_post_form extends moodleform { // We must make this check because all groups are returned for a visible grouped activity. if (forum_user_can_post_discussion($forum, $groupid, null, $cm, $modcontext)) { // Build the data for the groupinfo select. - $groupinfo[$groupid] = $group->name; + $groupinfo[$groupid] = format_string($group->name, true, ['context' => $modcontext]); } else { unset($groupdata[$groupid]); } diff --git a/mod/forum/report/summary/classes/output/filters.php b/mod/forum/report/summary/classes/output/filters.php index 54a6eea837c..0c350f1fe85 100644 --- a/mod/forum/report/summary/classes/output/filters.php +++ b/mod/forum/report/summary/classes/output/filters.php @@ -24,6 +24,7 @@ namespace forumreport_summary\output; +use context_course; use moodle_url; use renderable; use renderer_base; @@ -31,8 +32,6 @@ use stdClass; use templatable; use forumreport_summary; -defined('MOODLE_INTERNAL') || die(); - /** * Forum summary report filters renderable. * @@ -186,8 +185,9 @@ class filters implements renderable, templatable { $allowedgroupsobj = $usergroups; } + $contextcourse = context_course::instance($this->courseid); foreach ($allowedgroupsobj as $group) { - $groupsavailable[$group->id] = $group->name; + $groupsavailable[$group->id] = format_string($group->name, true, ['context' => $contextcourse]); } // Set valid groups selected.