MDL-12524 fixed quoting of phrases in mail header (problem with speci…

…al chars in names of users); merged from MOODLE_19_STABLE
moodle · Dec 17, 2007 · 5730323 · 5730323
1 parent 636b8f1
commit 5730323
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
@@ -1192,9 +1192,13 @@ function EncodeHeader ($str, $position = 'text') {
 
     /// Start Moodle Hack - do our own multibyte-safe header encoding
         $textlib = textlib_get_instance();
-        $result = $textlib->encode_mimeheader($str, $this->CharSet);
-        if ($result !== false) {
-            return $result;
+        $encoded = $textlib->encode_mimeheader($str, $this->CharSet);
+        if ($encoded !== false) {
+            $encoded = str_replace("\n", $this->LE, $encoded);
+            if ($position == 'phrase') {
+                return ("\"$encoded\"");
+            }
+            return $encoded;
         }
         // try the old way that does not handle binary-safe line splitting in mime header
     /// End Moodle Hack