ILB
/
moodle-mod_attendance
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixes #302 make sure user lang is used when sending mail.

MOODLE_35_STABLE
Dan Marsden 7 years ago
parent
a98bb53e64
commit
39f39676b4
1 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      classes/task/notify.php

8
classes/task/notify.php
View File

@ -91,11 +91,13 @@ class notify extends \core\task\scheduled_task {
$record = attendance_template_variables($record); $record = attendance_template_variables($record);
$user = $DB->get_record('user', array('id' => $record->userid)); $user = $DB->get_record('user', array('id' => $record->userid));
$from = \core_user::get_noreply_user(); $from = \core_user::get_noreply_user();
$oldforcelang = force_current_language($user->lang);
$emailcontent = format_text($record->emailcontent, $record->emailcontentformat); $emailcontent = format_text($record->emailcontent, $record->emailcontentformat);
$emailsubject = format_text($record->emailsubject);
email_to_user($user, $from, $emailsubject, $emailcontent, $emailcontent);
email_to_user($user, $from, $record->emailsubject, $emailcontent, $emailcontent); force_current_language($oldforcelang);
$sentnotifications[$record->userid][] = $record->aid; $sentnotifications[$record->userid][] = $record->aid;
$numsentusers++; $numsentusers++;
} }
@ -137,6 +139,7 @@ class notify extends \core\task\scheduled_task {
foreach ($thirdpartynotifications as $sendid => $notifications) { foreach ($thirdpartynotifications as $sendid => $notifications) {
$user = $DB->get_record('user', array('id' => $sendid)); $user = $DB->get_record('user', array('id' => $sendid));
$from = \core_user::get_noreply_user(); $from = \core_user::get_noreply_user();
$oldforcelang = force_current_language($user->lang);
$emailcontent = implode("\n", $notifications); $emailcontent = implode("\n", $notifications);
$emailcontent .= "\n\n".get_string('thirdpartyemailtextfooter', 'attendance'); $emailcontent .= "\n\n".get_string('thirdpartyemailtextfooter', 'attendance');
@ -144,6 +147,7 @@ class notify extends \core\task\scheduled_task {
$emailsubject = get_string('thirdpartyemailsubject', 'attendance'); $emailsubject = get_string('thirdpartyemailsubject', 'attendance');
email_to_user($user, $from, $emailsubject, $emailcontent, $emailcontent); email_to_user($user, $from, $emailsubject, $emailcontent, $emailcontent);
force_current_language($oldforcelang);
$numsentthird++; $numsentthird++;
} }
if (!empty($numsentthird)) { if (!empty($numsentthird)) {

Write Preview
Loading…
Cancel
Save