Add <> brackets around Return-Path, fixes PHPMailer#37

kenetik · Apr 4, 2013 · e47762f · e47762f
1 parent 1ebcb2f
commit e47762f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -1384,11 +1384,11 @@ public function CreateHeader() {
     }
 
     if ($this->ReturnPath) {
-      $result .= $this->HeaderLine('Return-Path', trim($this->ReturnPath));
+      $result .= $this->HeaderLine('Return-Path', '<'.trim($this->ReturnPath).'>');
     } elseif ($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
+      $result .= $this->HeaderLine('Return-Path', '<'.trim($this->From).'>');
     } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+      $result .= $this->HeaderLine('Return-Path', '<'.trim($this->Sender).'>');
     }
 
     // To be created automatically by mail()