Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

sofianarifianto · May 2, 2014 · 44d33d8 · 44d33d8
2 parents e6d7f38 + c7bec0c
commit 44d33d8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -1633,10 +1633,10 @@ public function createHeader()
         $this->boundary[3] = 'b3_' . $uniq_id;
 
         if ($this->MessageDate == '') {
-            $result .= $this->headerLine('Date', self::rfcDate());
-        } else {
-            $result .= $this->headerLine('Date', $this->MessageDate);
+            $this->MessageDate = self::rfcDate();
         }
+        $result .= $this->headerLine('Date', $this->MessageDate);
+
 
         // To be created automatically by mail()
         if ($this->SingleTo === true) {