diff options
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 7539fe54a..f863d4161 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -956,7 +956,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str = substr($this->_header_str, 0, -1); + $this->_header_str = rtrim($this->_header_str); } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 65950cdc3..d9017d904 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -133,6 +133,7 @@ SVN Revision: </p> <li>Fixed bug (#6517) where Routed URI segments returned by URI::rsegment() method were incorrect for the default controller.</li> <li>Fixed a bug (#6706) in the Security Helper where xss_clean() was using a deprecated second argument.</li> <li>Fixed a bug in the URL helper url_title() function where trailing periods were allowed at the end of a URL.</li> + <li>Fixed a bug (#6669) in the Email class when CRLF's are used for the newline character with headers when used with the "mail" protocol.</li> <li>Tweaked Typography::auto_typography() for some edge-cases.</li> </ul> |