summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-02 19:10:19 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-02 19:10:19 +0100
commit75b2c7fd0e23afc5c0338a7b62854d38b37b9c62 (patch)
tree0ed48198d63b37874d11ec3dc29645fa62f85aab /system
parent7cb8820bcdfdd398b874650cccd3edd552674e5d (diff)
parent593f798a0b463f45e00a207e4fe4b8cc82dedc35 (diff)
Merge pull request #1107 from diogoosorio/develop
Fix issue #1080
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index c8a5b41af..8d839d0c9 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1359,6 +1359,7 @@ class CI_Email {
if ( ! $this->$method())
{
$this->_set_error_message('lang:email_send_failure_' . ($this->_get_protocol() === 'mail' ? 'phpmail' : $this->_get_protocol()));
+ return FALSE;
}
$this->_set_error_message('lang:email_sent', $this->_get_protocol());
@@ -1433,8 +1434,10 @@ class CI_Email {
return FALSE;
}
- $this->_smtp_connect();
- $this->_smtp_authenticate();
+ if ( ! $this->_smtp_connect() OR ! $this->_smtp_authenticate())
+ {
+ return FALSE;
+ }
$this->_send_command('from', $this->clean_email($this->_headers['From']));