L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-81678 enrol: don't escape course name in welcome message.

Browse Source
This commit is contained in:
Paul Holden
2024-06-07 11:39:43 +01:00
parent db07c09afc
commit 2b4769bb73
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/manual/tests/lib_test.php
+4 -3
View File
@@ -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.
lib/enrollib.php
+2 -3
View File
@@ -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;