Skip to content

Commit 9e4b8fb

Browse files
committed
Minor cleanup, fixes PHPMailer#918, broken version file
Remove duplicate check for Sender address
1 parent ed4e7ce commit 9e4b8fb

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.16
1+
5.2.19

changelog.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# ChangeLog
22

3+
## Version 5.2.19 (December 26th 2016)
4+
* Minor cleanup
5+
36
## Version 5.2.18 (December 24th 2016)
47
* **SECURITY** Critical security update for CVE-2016-10033 please update now! Thanks to [Dawid Golunski](https://legalhackers.com).
58
* Add ability to extract the SMTP transaction ID from some common SMTP success messages

class.phpmailer.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PHPMailer
3131
* The PHPMailer Version number.
3232
* @var string
3333
*/
34-
public $Version = '5.2.18';
34+
public $Version = '5.2.19';
3535

3636
/**
3737
* Email priority.
@@ -164,7 +164,6 @@ class PHPMailer
164164

165165
/**
166166
* The path to the sendmail program.
167-
* Must contain only a path to an executable, with no parameters or switches
168167
* @var string
169168
*/
170169
public $Sendmail = '/usr/sbin/sendmail';
@@ -1365,7 +1364,7 @@ public function postSend()
13651364
*/
13661365
protected function sendmailSend($header, $body)
13671366
{
1368-
if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
1367+
if (!empty($this->Sender)) {
13691368
if ($this->Mailer == 'qmail') {
13701369
$sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
13711370
} else {

class.pop3.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class POP3
3434
* @var string
3535
* @access public
3636
*/
37-
public $Version = '5.2.18';
37+
public $Version = '5.2.19';
3838

3939
/**
4040
* Default POP3 port number.

class.smtp.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SMTP
3030
* The PHPMailer SMTP version number.
3131
* @var string
3232
*/
33-
const VERSION = '5.2.18';
33+
const VERSION = '5.2.19';
3434

3535
/**
3636
* SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
8181
* @deprecated Use the `VERSION` constant instead
8282
* @see SMTP::VERSION
8383
*/
84-
public $Version = '5.2.18';
84+
public $Version = '5.2.19';
8585

8686
/**
8787
* SMTP server port number.

0 commit comments

Comments
 (0)