diff options
| author | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-02-18 12:59:23 +0100 |
|---|---|---|
| committer | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-02-18 12:59:23 +0100 |
| commit | 193f0c76edbd85cf98ae730006b459c7c55a5b78 (patch) | |
| tree | 1b80fb8c40f96154d524cd29a961b2bd8e097b10 | |
| parent | 9892d4d36b4ccfc647e9490b3c2e24de8b44964a (diff) | |
removed PR from the bug list
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index b0d0921eb..91c119e02 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1868,7 +1868,7 @@ class CI_Email { */ protected function _smtp_connect($force=FALSE) { - if ( ! is_resource($this->_smtp_connect) || $force) + if ( ! is_resource($this->_smtp_connect) OR $force) { $ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : NULL; diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3824092b6..f1bb0c58e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -486,7 +486,7 @@ Bug fixes for 3.0 - Fixed a bug - :doc:`DB result <database/results>` method ``list_fields()`` didn't reset its field pointer for the *mysql*, *mysqli* and *mssql* drivers. - Fixed a bug (#73) - :doc:`Security Library <libraries/security>` method ``sanitize_filename()`` could be tricked by an XSS attack. - Fixed a bug (#2211) - :doc:`Migration Library <libraries/migration>` extensions couldn't execute ``CI_Migration::__construct()``. -- Fixed a bug (#2255, #2256) where ``smtp_timeout`` was not being applied to read and writes for the socket. +- Fixed a bug (#2255) where ``smtp_timeout`` was not being applied to read and writes for the socket. Version 2.1.3 ============= |