L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-30575 yet more mail header cleanup

Browse Source
This commit is contained in:
Petr Skoda
2011-12-11 23:42:32 +01:00
parent a9e3abe0b4
commit 1501cc8cea
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/phpmailer/class.phpmailer.php
+5 -5
View File
@@ -653,11 +653,11 @@ class PHPMailer
*/
function AddrFormat($addr) {
if(empty($addr[1]))
$formatted = $addr[0];
$formatted = preg_replace('/[\r\n]+/', '', $addr[0]); // Moodle modification
else
{
$formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" .
$addr[0] . ">";
$formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" .
preg_replace('/[\r\n]+/', '', $addr[0]) . ">"; // Moodle modification
}
return $formatted;
@@ -780,9 +780,9 @@ class PHPMailer
$result .= $this->HeaderLine("Date", $this->RFCDate());
if($this->Sender == "")
$result .= $this->HeaderLine("Return-Path", trim($this->From));
$result .= $this->HeaderLine("Return-Path", trim(preg_replace('/[\r\n]+/', '', $this->From))); // Moodle modification
else
$result .= $this->HeaderLine("Return-Path", trim($this->Sender));
$result .= $this->HeaderLine("Return-Path", trim(preg_replace('/[\r\n]+/', '', $this->Sender))); // Moodle modification
// To be created automatically by mail()
if($this->Mailer != "mail")