summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 592ead3d2..8c56ccca0 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -88,10 +88,12 @@ class CI_Email {
{
$this->initialize($config);
}
-
- $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;
- $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE;
-
+ else
+ {
+ $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;
+ $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE;
+ }
+
log_message('debug', "Email Class Initialized");
}
@@ -123,6 +125,9 @@ class CI_Email {
}
}
}
+
+ $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;
+ $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE;
}
// --------------------------------------------------------------------