mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-01 21:55:12 +02:00
Code Issues Projects Releases Wiki Activity

MDL-12524 fixed quoting of phrases in mail header (problem with special chars in names of users); merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2007-12-17 21:39:03 +00:00
parent 636b8f19cb
commit 5730323b4b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/phpmailer/class.phpmailer.php
View File

@ -1192,9 +1192,13 @@ class PHPMailer
/// 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