diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-03-28 16:31:09 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-03-28 16:31:09 +0200 |
| commit | bdcafdfa204b041493707caa277915e00a124eaf (patch) | |
| tree | 972d5b226f7a4f64e74d111c3bb658dc8f75ca6a | |
| parent | 0eb38af2eaf1127b9b82261b7ec3bf4d4b847318 (diff) | |
[ci skip] Fix 5070
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 955787d28..d4b938701 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -941,7 +941,7 @@ class CI_Email { foreach ($this->_base_charsets as $charset) { - if (strpos($charset, $this->charset) === 0) + if (strpos($this->charset, $charset) === 0) { $this->_encoding = '7bit'; } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 209193bb0..00eaedaf2 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,10 @@ Version 3.1.5 Release Date: Not Released +Bug fixes for 3.1.5 +------------------- + +- Fixed a bug (#5070) - :doc:`Email Library <libraries/email>` didn't properly detect 7-bit encoding. Version 3.1.4 ============= |