diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-02-19 13:55:14 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-02-19 13:55:14 +0100 |
| commit | d2dbee42b379166e8be43e4e904f33a8c88ecef3 (patch) | |
| tree | 78822ff23be5f835660db2eb18c93f85e36cb470 | |
| parent | 268f4496a40b15af9fe52087cab4963d38020edd (diff) | |
| parent | 32c1e626d51517418acbecadde9a83d67517e0a8 (diff) | |
Merge pull request #2261 from nisheeth-barthwal/develop
Fixed Issue #2239
| -rw-r--r-- | system/libraries/Email.php | 7 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 074ce60fc..daa38484b 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1205,8 +1205,11 @@ class CI_Email { { if ($this->protocol === 'mail') { - $this->_subject = $this->_headers['Subject']; - unset($this->_headers['Subject']); + if (isset($this->_headers['Subject'])) + { + $this->_subject = $this->_headers['Subject']; + unset($this->_headers['Subject']); + } } reset($this->_headers); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 4e55182e5..a5f560564 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -487,6 +487,7 @@ Bug fixes for 3.0 - 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) where ``smtp_timeout`` was not being applied to read and writes for the socket. +- Fixed a bug (#2239) of missing subject when using ``bcc_batch_mode``. Version 2.1.3 ============= |