From 0b8b0732fbdbf1ba4c386dabec1b0ed927429746 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 2 May 2025 09:31:55 +0100 Subject: [PATCH] MDL-85346 course: correctly retrieve course request email content. --- public/course/classes/course_request.php | 10 ++++++---- public/lang/en/admin.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/public/course/classes/course_request.php b/public/course/classes/course_request.php index ecef8037863..1a2df4e9c18 100644 --- a/public/course/classes/course_request.php +++ b/public/course/classes/course_request.php @@ -109,13 +109,15 @@ class course_request { // Notify the admin if required. if ($users = get_users_from_config($CFG->courserequestnotify, 'moodle/site:approvecourse')) { + $category = \core_course_category::get($data->category); + $a = new stdClass(); $a->link = "$CFG->wwwroot/course/pending.php"; $a->user = fullname($USER); - $a->shortname = s($data->shortname) ?? ''; - $a->fullname = s($data->fullname) ?? ''; - $a->category = s($data->category) ?? ''; - $a->reason = format_text($data->reason, FORMAT_PLAIN) ?? ''; + $a->shortname = format_string($data->shortname, true, ['context' => $category->get_context()]); + $a->fullname = format_string($data->fullname, true, ['context' => $category->get_context()]); + $a->category = $category->get_formatted_name(); + $a->reason = format_text($data->reason, FORMAT_PLAIN); $subject = get_string('courserequest'); $message = get_string('courserequestnotifyemail', 'admin', $a); foreach ($users as $user) { diff --git a/public/lang/en/admin.php b/public/lang/en/admin.php index 5f33a07f788..ae7be298914 100644 --- a/public/lang/en/admin.php +++ b/public/lang/en/admin.php @@ -455,7 +455,7 @@ $string['courserequestnotifyemail'] = '

User {$a->user} has requested a new co

Request details:

';