summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authornisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in>2013-02-18 12:59:23 +0100
committernisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in>2013-02-18 12:59:23 +0100
commit193f0c76edbd85cf98ae730006b459c7c55a5b78 (patch)
tree1b80fb8c40f96154d524cd29a961b2bd8e097b10 /system
parent9892d4d36b4ccfc647e9490b3c2e24de8b44964a (diff)
removed PR from the bug list
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index b0d0921eb..91c119e02 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1868,7 +1868,7 @@ class CI_Email {
*/
protected function _smtp_connect($force=FALSE)
{
- if ( ! is_resource($this->_smtp_connect) || $force)
+ if ( ! is_resource($this->_smtp_connect) OR $force)
{
$ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : NULL;