From: moodler <moodler>
Date: Wed, 23 Apr 2008 02:27:37 +0000 (+0000)
Subject: Merged MDL-14483 from 1.9:  Use the recipient language to send email
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f49edc81d6c799fa44091be07f421f1726e467d5;p=moodle.git

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

diff --git a/message/lib.php b/message/lib.php
index 76dcd2ec19..b7278239b4 100644
--- 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;
 }