diff options
| author | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
|---|---|---|
| committer | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
| commit | 76f42d9dcd42bf90c407f151d04ef207c8deebdf (patch) | |
| tree | c98568cd18540f2df23881ceed82cf9f1616d4c4 /system/libraries/Email.php | |
| parent | 7d10006a0001ff0e7d82ec994b1e9cbb63683ffc (diff) | |
| parent | 13f6eabafa655828a8c09b4ae0a58a2e3776c269 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 728b637a3..a745d331d 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -105,9 +105,9 @@ class CI_Email { /** * SMTP Encryption * - * @var string NULL, 'tls' or 'ssl' + * @var string empty, 'tls' or 'ssl' */ - public $smtp_crypto = NULL; + public $smtp_crypto = ''; /** * Whether to apply word-wrapping to the message body. @@ -1875,7 +1875,7 @@ class CI_Email { return TRUE; } - $ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : NULL; + $ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : ''; $this->_smtp_connect = fsockopen($ssl.$this->smtp_host, $this->smtp_port, @@ -2021,8 +2021,7 @@ class CI_Email { { return TRUE; } - - if (strpos($reply, '334') !== 0) + elseif (strpos($reply, '334') !== 0) { $this->_set_error_message('lang:email_failed_smtp_login', $reply); return FALSE; |