From: poltawski <poltawski>
Date: Wed, 25 Mar 2009 09:18:19 +0000 (+0000)
Subject: lib/email_to_user MDL-10384 Recipeint names broken
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=eac4623d29753bd83a6f4450861f1148acd0a1a7;p=moodle.git

lib/email_to_user MDL-10384 Recipeint names broken

When emailcharset is not utf8 the charset conversion was breaking
recipient/replyto names

thanks to Tatsuya Shirai
merged from MOODLE_19_STABLE
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 400bd3f2ad..19af1c127a 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4225,11 +4225,11 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
         /// And convert some strings
             $mail->FromName = $textlib->convert($mail->FromName, 'utf-8', $mail->CharSet); //From Name
             foreach ($mail->ReplyTo as $key => $rt) {                                      //ReplyTo Names
-                $mail->ReplyTo[$key][1] = $textlib->convert($rt, 'utf-8', $mail->CharSet);
+                $mail->ReplyTo[$key][1] = $textlib->convert($rt[1], 'utf-8', $mail->CharSet);
             }
             $mail->Subject = $textlib->convert($mail->Subject, 'utf-8', $mail->CharSet);   //Subject
             foreach ($mail->to as $key => $to) {
-                $mail->to[$key][1] = $textlib->convert($to, 'utf-8', $mail->CharSet);      //To Names
+                $mail->to[$key][1] = $textlib->convert($to[1], 'utf-8', $mail->CharSet);      //To Names
             }
             $mail->Body = $textlib->convert($mail->Body, 'utf-8', $mail->CharSet);         //Body
             $mail->AltBody = $textlib->convert($mail->AltBody, 'utf-8', $mail->CharSet);   //Subject