mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jim Jagielski 2016-05-15 09:45:38 -04:00
parent 33fdd0bb46 7b9fd07309
commit 74db8a202a
5 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -1,5 +1,6 @@
# ChangeLog
## Version 5.2.15 (May 10th 2016)
* Added ability to inject custom address validators, and set the default validator
* Fix TLS 1.2 compatibility
* Remove some excess line breaks in MIME structure

9
class.phpmailer.php
View File

@ -31,7 +31,7 @@ class PHPMailer
* The PHPMailer Version number.
* @var string
*/
public $Version = '5.2.14';
public $Version = '5.2.15';
/**
* Email priority.
@ -1541,12 +1541,17 @@ class PHPMailer
* @throws phpmailerException
* @return boolean
*/
public function smtpConnect($options = array())
public function smtpConnect($options = null)
{
if (is_null($this->smtp)) {
$this->smtp = $this->getSMTPInstance();
}
//If no options are provided, use whatever is set in the instance
if (is_null($options)) {
$options = $this->SMTPOptions;
}
// Already connected?
if ($this->smtp->connected()) {
return true;

2
class.pop3.php
View File

@ -34,7 +34,7 @@ class POP3
* @var string
* @access public
*/
public $Version = '5.2.14';
public $Version = '5.2.15';
/**
* Default POP3 port number.

4
class.smtp.php
View File

@ -30,7 +30,7 @@ class SMTP
* The PHPMailer SMTP version number.
* @var string
*/
const VERSION = '5.2.14';
const VERSION = '5.2.15';
/**
* SMTP line break constant.
@ -81,7 +81,7 @@ class SMTP
* @deprecated Use the `VERSION` constant instead
* @see SMTP::VERSION
*/
public $Version = '5.2.14';
public $Version = '5.2.15';
/**
* SMTP server port number.

26
language/phpmailer.lang-si.php
View File

@ -1,26 +0,0 @@
<?php
/**
* Sinhala PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Senasum Rajapalsha <senasum@live.com>
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP fodihls: l%shd lrúh fkdyl .';
$PHPMAILER_LANG['connect_host'] = 'SMTP fodihls: iïnkao l, fkdyl.';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fodihls: o;a; Ndr .; fkdyl.';
$PHPMAILER_LANG['empty_message'] = 'ysia mksúvhls';
$PHPMAILER_LANG['encoding'] = 'iqrlaYs; njg m;a lrï: ';
$PHPMAILER_LANG['execute'] = 'l%shd lrúh fkdyl: ';
$PHPMAILER_LANG['file_access'] = 'f.dkqj fj; ,.d úh fkdyl: ';
$PHPMAILER_LANG['file_open'] = 'f.dkqj újD; fkdfj: ';
$PHPMAILER_LANG['from_failed'] = 'f*d¾uh jrÈh: ';
$PHPMAILER_LANG['instantiate'] = 'jyd l, hq;= fj.';
$PHPMAILER_LANG['invalid_address'] = 'smskh jrÈh: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mksúv lre fkd.,mS.';
$PHPMAILER_LANG['provide_address'] = ',smskh w;=,a lrkak.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP fodihls: mksúvh ,.d l, fkdyl: ';
$PHPMAILER_LANG['signing'] = 'w;=,a úh fkdyl: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP iïnkao l, fkdyl.';
$PHPMAILER_LANG['smtp_error'] = 'SMTP fodihls:: ';
$PHPMAILER_LANG['variable_set'] = 'úp,h ilia lr fkdu;: ';
$PHPMAILER_LANG['extension_missing'] = 'l%shd lrúh fkdyl: ';