From f08f655d4f3f63f66f8db3dbce6045939f304f03 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:16:03 +0000 Subject: Added smtp authorization settings to initialize function, as per this bug report: http://codeigniter.com/bug_tracker/bug/4615/ --- system/libraries/Email.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'system') 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; } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b