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

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