From 2b4769bb73fa713af46633af91c36004078c3d39 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 24 Apr 2024 17:07:27 +0100
Subject: [PATCH] MDL-81678 enrol: don't escape course name in welcome message.

---
 enrol/manual/tests/lib_test.php | 7 ++++---
 lib/enrollib.php                | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/enrol/manual/tests/lib_test.php b/enrol/manual/tests/lib_test.php
index 28258e8d7f8..9cca04892cc 100644
--- a/enrol/manual/tests/lib_test.php
+++ b/enrol/manual/tests/lib_test.php
@@ -800,7 +800,7 @@ class lib_test extends \advanced_testcase {
 
         // Create course.
         $course = $this->getDataGenerator()->create_course([
-            'fullname' => 'Course 1',
+            'fullname' => 'Course 1 & 2',
             'shortname' => 'C1',
         ]);
         // Create users.
@@ -860,7 +860,8 @@ class lib_test extends \advanced_testcase {
             instance: $maninstance,
             userid: $student->id,
             sendoption: ENROL_SEND_EMAIL_FROM_COURSE_CONTACT,
-            message: 'Your email address: {$a->email}, your first name: {$a->firstname}, your last name: {$a->lastname}',
+            message: 'Your email address: {$a->email}, your first name: {$a->firstname}, your last name: {$a->lastname}, ' .
+                'your course: {$a->coursename}',
         );
         $messages = $messagesink->get_messages_by_component_and_type(
             'moodle',
@@ -874,7 +875,7 @@ class lib_test extends \advanced_testcase {
         $this->assertStringContainsString($course->fullname, $message->subject);
         $this->assertEquals(
             'Your email address: ' . $student->email . ', your first name: ' . $student->firstname . ', your last name: ' .
-                $student->lastname,
+                $student->lastname . ', your course: ' . $course->fullname,
             $message->fullmessage,
         );
         // Clear sink.
diff --git a/lib/enrollib.php b/lib/enrollib.php
index 11a83a2d5d6..7b2cac48c1c 100644
--- a/lib/enrollib.php
+++ b/lib/enrollib.php
@@ -3662,7 +3662,7 @@ abstract class enrol_plugin {
         );
 
         $a = new stdClass();
-        $a->coursename = format_string($course->fullname, true, ['context' => $context]);
+        $a->coursename = format_string($course->fullname, true, ['context' => $context, 'escape' => false]);
         $a->profileurl = (new moodle_url(
             url: '/user/view.php',
             params: [
@@ -3707,7 +3707,6 @@ abstract class enrol_plugin {
             $messagehtml = text_to_html($messagetext, null, false, true);
         }
 
-        $subject = get_string('welcometocourse', 'moodle', format_string($course->fullname, true, ['context' => $context]));
         $contact = $this->get_welcome_message_contact(
             sendoption: $sendoption,
             context: $context,
@@ -3723,7 +3722,7 @@ abstract class enrol_plugin {
         $message->name = 'enrolcoursewelcomemessage';
         $message->userfrom = $contact;
         $message->userto = $user;
-        $message->subject = $subject;
+        $message->subject = get_string('welcometocourse', 'moodle', $a->coursename);
         $message->fullmessage = $messagetext;
         $message->fullmessageformat = FORMAT_MARKDOWN;
         $message->fullmessagehtml = $messagehtml;