Merge branch 'MDL-81112-403' of https://github.com/paulholden/moodle into MOODLE_403_STABLE

2024-03-21 17:11:35 +01:00
parent e4b036da69 d3faf37e8b
commit 23ec91a2c4
1 changed files with 7 additions and 1 deletions
@@ -740,11 +740,17 @@ class grade_report_grader extends grade_report {
            $userrow->cells[] = $usercell;

            foreach ($extrafields as $field) {
+                $fieldcellcontent = s($user->$field);
+                if ($field === 'country') {
+                    $countries = get_string_manager()->get_list_of_countries();
+                    $fieldcellcontent = $countries[$user->$field] ?? $fieldcellcontent;
+                }
+
                $fieldcell = new html_table_cell();
                $fieldcell->attributes['class'] = 'userfield user' . $field;
                $fieldcell->attributes['data-col'] = $field;
                $fieldcell->header = false;
-                $fieldcell->text = html_writer::tag('div', s($user->{$field}), [
+                $fieldcell->text = html_writer::tag('div', $fieldcellcontent, [
                    'data-collapse' => 'content'
                ]);