diff options
| author | Rick Ellis <rick.ellis@ellislab.com> | 2008-09-30 23:16:03 +0200 |
|---|---|---|
| committer | Rick Ellis <rick.ellis@ellislab.com> | 2008-09-30 23:16:03 +0200 |
| commit | f08f655d4f3f63f66f8db3dbce6045939f304f03 (patch) | |
| tree | d24a3de0f2d18e8ed256ab73d393367175dcdee2 | |
| parent | 46c23637dcbdff4fab3f90ca81187729e606397f (diff) | |
Added smtp authorization settings to initialize function, as per this bug report: http://codeigniter.com/bug_tracker/bug/4615/
| -rw-r--r-- | system/libraries/Email.php | 13 |
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;
}
// --------------------------------------------------------------------
|