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

Merge branch 'MDL-85684' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2025-09-26 11:31:12 +08:00
parent 9a6b9a0b2c a6ab780daa
commit 847c9b4030
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/mod/assign/classes/notification_helper.php
+26 -8
View File
@@ -361,8 +361,14 @@ class notification_helper {
$stringparams = [
'firstname' => $user->firstname,
'assignmentname' => $assignmentobj->get_instance()->name,
'coursename' => $assignmentobj->get_course()->fullname,
'assignmentname' => format_string(
$assignmentobj->get_instance()->name,
options: ['context' => $assignmentobj->get_context()],
),
'coursename' => format_string(
$assignmentobj->get_course()->fullname,
options: ['context' => $assignmentobj->get_course_context()],
),
'duedate' => userdate($duedate),
'url' => $url,
'shortlink' => $shortlink,
@@ -372,7 +378,7 @@ class notification_helper {
'user' => \core_user::get_user($user->id),
'url' => $url->out(false),
'subject' => get_string('assignmentduesoonsubject', 'mod_assign', $stringparams),
'assignmentname' => $assignmentobj->get_instance()->name,
'assignmentname' => $stringparams['assignmentname'],
'html' => get_string('assignmentduesoonhtml', 'mod_assign', $stringparams),
'sms' => get_string('assignmentduesoonsms', 'mod_assign', $stringparams),
];
@@ -464,8 +470,14 @@ class notification_helper {
$stringparams = [
'firstname' => $user->firstname,
'assignmentname' => $assignmentobj->get_instance()->name,
'coursename' => $assignmentobj->get_course()->fullname,
'assignmentname' => format_string(
$assignmentobj->get_instance()->name,
options: ['context' => $assignmentobj->get_context()],
),
'coursename' => format_string(
$assignmentobj->get_course()->fullname,
options: ['context' => $assignmentobj->get_course_context()],
),
'duedate' => userdate($duedate),
'url' => $url,
'cutoffsnippet' => $snippet,
@@ -476,7 +488,7 @@ class notification_helper {
'user' => \core_user::get_user($user->id),
'url' => $url->out(false),
'subject' => get_string('assignmentoverduesubject', 'mod_assign', $stringparams),
'assignmentname' => $assignmentobj->get_instance()->name,
'assignmentname' => $stringparams['assignmentname'],
'html' => get_string('assignmentoverduehtml', 'mod_assign', $stringparams),
'sms' => get_string('assignmentoverduesms', 'mod_assign', $stringparams),
];
@@ -559,8 +571,14 @@ class notification_helper {
);
$assignmentsfordigest[$assignment->id] = [
'assignmentname' => $assignmentobj->get_instance()->name,
'coursename' => $assignmentobj->get_course()->fullname,
'assignmentname' => format_string(
$assignmentobj->get_instance()->name,
options: ['context' => $assignmentobj->get_context()],
),
'coursename' => format_string(
$assignmentobj->get_course()->fullname,
options: ['context' => $assignmentobj->get_course_context()],
),
'duetime' => userdate($duedate, get_string('strftimetime12', 'langconfig')),
'url' => $url,
'shortlink' => $shortlink,