summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-10-31 18:00:06 +0100
committerDerek Jones <derek.jones@ellislab.com>2011-10-31 18:00:06 +0100
commit0087bb039f10e571b79217d80826a99a678dad78 (patch)
tree1a1806ccffd64f61d20f62490b7859b2ab53329c
parent3485f7e2f14a7f96e348d3c927ee256c8d290027 (diff)
parente862ddd7c33cc41f306d21725c93170daf864c52 (diff)
Merge pull request #624 from talkingwithsean/develop
Crypt isn't set and it causes extensive script time when specifying a cus
-rw-r--r--system/libraries/Email.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index db6ea8f90..6739db33b 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1718,12 +1718,12 @@ class CI_Email {
$this->_send_command('hello');
$this->_send_command('starttls');
$crypto = stream_socket_enable_crypto($this->_smtp_connect, TRUE, STREAM_CRYPTO_METHOD_TLS_CLIENT);
- }
- if ($crypto !== TRUE)
- {
- $this->_set_error_message('lang:email_smtp_error', $this->_get_smtp_data());
- return FALSE;
+ if ($crypto !== TRUE)
+ {
+ $this->_set_error_message('lang:email_smtp_error', $this->_get_smtp_data());
+ return FALSE;
+ }
}
return $this->_send_command('hello');