diff options
| author | Diogo Osório <diogo.g.osorio@gmail.com> | 2012-03-02 19:04:17 +0100 |
|---|---|---|
| committer | Diogo Osório <diogo.g.osorio@gmail.com> | 2012-03-02 19:04:17 +0100 |
| commit | 593f798a0b463f45e00a207e4fe4b8cc82dedc35 (patch) | |
| tree | d6ce46fa1342d1ac031d0046d00e6e24cbd8bd89 | |
| parent | 7fcc7bdf7eb9c65920b1e14f242e31e3d71d1fd0 (diff) | |
Made the code more readable, updated the changelog.
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 39a7059dd..8d839d0c9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1434,7 +1434,7 @@ class CI_Email { return FALSE; } - if ( !($this->_smtp_connect() && $this->_smtp_authenticate()) ) + if ( ! $this->_smtp_connect() OR ! $this->_smtp_authenticate()) { return FALSE; } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 69d7efc6c..1eae6fea0 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -128,6 +128,7 @@ Bug fixes for 3.0 - Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars(). - Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set. - Fixed a bug in Oracle's :doc:`Database Forge Class <database/forge>` method _create_table() where it failed with AUTO_INCREMENT as it's not supported. +- Fixed a bug (#1080) - When using the SMTP protocol, the :doc:`Email Library <libraries/email>` send() method was returning TRUE even if the connection/authentication against the server failed. Version 2.1.1 ============= |