sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport a fix for qmail from PHPMailer upstream. 

props bpetty.
fixes #25014.


git-svn-id: https://develop.svn.wordpress.org/trunk@25682 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-10-03 03:00:01 +00:00
parent 2068a3e6da
commit df0aceb365
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/class-phpmailer.php
View File

@ -923,9 +923,9 @@ class PHPMailer {
$to = implode(', ', $toArr); $to = implode(', ', $toArr);
if (empty($this->Sender)) { if (empty($this->Sender)) {
$params = "-oi "; $params = " ";
} else { } else {
$params = sprintf("-oi -f%s", $this->Sender); $params = sprintf("-f%s", $this->Sender);
} }
if ($this->Sender != '' and !ini_get('safe_mode')) { if ($this->Sender != '' and !ini_get('safe_mode')) {
$old_from = ini_get('sendmail_from'); $old_from = ini_get('sendmail_from');