From 3215a7b190adfce906441e12d915a2cd68f4b9ac Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 19 May 2023 10:02:58 +0100
Subject: [PATCH] MDL-78018 mod_assign: format group name in grading table.

---
 mod/assign/classes/downloader.php | 4 ++--
 mod/assign/gradingtable.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/assign/classes/downloader.php b/mod/assign/classes/downloader.php
index dc0d7145e1e..7d29461f8f7 100644
--- a/mod/assign/classes/downloader.php
+++ b/mod/assign/classes/downloader.php
@@ -176,7 +176,7 @@ class downloader {
         if ($this->instance->teamsubmission) {
             $submissiongroup = $manager->get_submission_group($student->id);
             if ($submissiongroup) {
-                $groupname = $submissiongroup->name;
+                $groupname = format_string($submissiongroup->name, true, ['context' => $manager->get_context()]);
                 $groupinfo = '_' . $submissiongroup->id;
             } else {
                 $groupname = get_string('defaultteam', 'mod_assign');
@@ -280,7 +280,7 @@ class downloader {
             $this->instance->name,
         ];
         if (!empty($this->groupid)) {
-            $filenameparts[] = groups_get_group_name($this->groupid);
+            $filenameparts[] = format_string(groups_get_group_name($this->groupid), true, ['context' => $manager->get_context()]);
         }
         $filenameparts[] = $manager->get_course_module()->id;
 
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 0ac3e7573a4..d5f7fd18dbe 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -789,7 +789,7 @@ class assign_grading_table extends table_sql implements renderable {
         $group = false;
         $this->get_group_and_submission($row->id, $group, $submission, -1);
         if ($group) {
-            return $group->name;
+            return format_string($group->name, true, ['context' => $this->assignment->get_context()]);
         } else if ($this->assignment->get_instance()->preventsubmissionnotingroup) {
             $usergroups = $this->assignment->get_all_groups($row->id);
             if (count($usergroups) > 1) {