mirror of
https://github.com/moodle/moodle.git
synced 2025-03-15 05:00:06 +01:00
Merged MDL-14483 from 1.9: Use the recipient language to send email
This commit is contained in:
parent
c79106c4b5
commit
f49edc81d6
@ -928,7 +928,14 @@ function message_format_message(&$message, &$user, $format='', $keywords='', $cl
|
||||
*/
|
||||
function message_post_message($userfrom, $userto, $message, $format, $messagetype) {
|
||||
|
||||
global $CFG, $SITE;
|
||||
global $CFG, $SITE, $USER;
|
||||
|
||||
/// Set up current language to suit the receiver of the message
|
||||
$savelang = $USER->lang;
|
||||
|
||||
if (!empty($userto->lang)) {
|
||||
$USER->lang = $userto->lang;
|
||||
}
|
||||
|
||||
/// Save the new message in the database
|
||||
|
||||
@ -994,6 +1001,8 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
|
||||
}
|
||||
}
|
||||
|
||||
$USER->lang = $savelang; // restore original language
|
||||
|
||||
return $savemessage->id;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user