Minor cleanup, fixes PHPMailer#918, broken version file

Remove duplicate check for Sender address
radhey2010 · Dec 26, 2016 · 9e4b8fb · 9e4b8fb
1 parent ed4e7ce
commit 9e4b8fb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.16
+5.2.19
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+## Version 5.2.19 (December 26th 2016)
+* Minor cleanup
+
 ## Version 5.2.18 (December 24th 2016)
 * **SECURITY** Critical security update for CVE-2016-10033 please update now! Thanks to [Dawid Golunski](https://legalhackers.com).
 * Add ability to extract the SMTP transaction ID from some common SMTP success messages

diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @var string
      */
-    public $Version = '5.2.18';
+    public $Version = '5.2.19';
 
     /**
      * Email priority.
@@ -164,7 +164,6 @@ class PHPMailer
 
     /**
      * The path to the sendmail program.
-     * Must contain only a path to an executable, with no parameters or switches
      * @var string
      */
     public $Sendmail = '/usr/sbin/sendmail';
@@ -1365,7 +1364,7 @@ public function postSend()
      */
     protected function sendmailSend($header, $body)
     {
-        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+        if (!empty($this->Sender)) {
             if ($this->Mailer == 'qmail') {
                 $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
             } else {

diff --git a/class.pop3.php b/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @var string
      * @access public
      */
-    public $Version = '5.2.18';
+    public $Version = '5.2.19';
 
     /**
      * Default POP3 port number.

diff --git a/class.smtp.php b/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @var string
      */
-    const VERSION = '5.2.18';
+    const VERSION = '5.2.19';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.18';
+    public $Version = '5.2.19';
 
     /**
      * SMTP server port number.