Ticket #14888: 14888.patch

wp-includes/class-phpmailer.php

@@ -1141 +1141 @@
 
     $result .= $this->HeaderLine('Date', self::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()