Ticket #14888: wp-phpmailer.diff

(a) a/wp-includes/class-phpmailer.php.orig vs. (b) b/wp-includes/class-phpmailer.php

@@ -518 +518 @@
       return false;
     }
 
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
+    if(!$this->smtp->Mail($this->Sender)) {
       $error = $this->Lang('from_failed') . $smtp_from;
       $this->SetError($error);
       $this->smtp->Reset();
@@ -865 +864 @@
 
     $result .= $this->HeaderLine('Date', $this->RFCDate());
     if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
-    } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+      $this->Sender = trim($this->From);
     }
 
     /* To be created automatically by mail() */