diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-03 03:43:10 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-03 03:43:10 +0100 |
commit | 27984584d83784b39cf68e39200084ca2c8dc905 (patch) | |
tree | 3fecee9f5dd94689a40855821a5c9c9e4c03bf98 /system/libraries | |
parent | 2f136f11685e43025b2f3f98c05d60dd4502e8dd (diff) | |
parent | a19beb0c580ac78c4b75548a046240a85f30cb29 (diff) |
Merge upstream branch
Diffstat (limited to 'system/libraries')
-rw-r--r-- | system/libraries/Email.php | 7 | ||||
-rw-r--r-- | system/libraries/Session.php | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index c8a5b41af..8d839d0c9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1359,6 +1359,7 @@ class CI_Email { if ( ! $this->$method()) { $this->_set_error_message('lang:email_send_failure_' . ($this->_get_protocol() === 'mail' ? 'phpmail' : $this->_get_protocol())); + return FALSE; } $this->_set_error_message('lang:email_sent', $this->_get_protocol()); @@ -1433,8 +1434,10 @@ class CI_Email { return FALSE; } - $this->_smtp_connect(); - $this->_smtp_authenticate(); + if ( ! $this->_smtp_connect() OR ! $this->_smtp_authenticate()) + { + return FALSE; + } $this->_send_command('from', $this->clean_email($this->_headers['From'])); diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 66b39a6a2..dd50a91e1 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -219,7 +219,7 @@ class CI_Session { $this->CI->db->where('user_agent', $session['user_agent']); } - $query = $this->CI->db->get($this->sess_table_name); + $query = $this->CI->db->limit(1)->get($this->sess_table_name); // No result? Kill it! if ($query->num_rows() === 0) |