From e46b819bb6057e0d67e1fafb2dd609669c5d5710 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 3 Oct 2013 03:00:09 +0000
Subject: [PATCH] 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
---
 wp-includes/class-phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php
index 38ac37626a..238474edff 100644
--- a/wp-includes/class-phpmailer.php
+++ b/wp-includes/class-phpmailer.php
@@ -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');