Merged MDL-14483 from 1.9: Use the recipient language to send email

diff --git a/message/lib.php b/message/lib.php
index 76dcd2ec1918cc68103cdbf70794112922d1f479..b7278239b46a16e9009978a84e6a3c4537a2d7fd 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -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;
 }