WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport a fix for qmail from PHPMailer upstream. 

props bpetty.
fixes #25014.

Built from https://develop.svn.wordpress.org/trunk@25682


git-svn-id: http://core.svn.wordpress.org/trunk@25598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-03 03:00:09 +00:00
parent aef18d93cb
commit e46b819bb6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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