diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 21:32:14 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 21:32:14 +0100 |
| commit | 1d89088e2bbab32e80bd9fe0d74d5df32ab1e3ac (patch) | |
| tree | 928808131b17c08537073b2aaa5108a8a58d367e | |
| parent | a04cfa77a3b113e5a9d858466bc9ae9f674081fb (diff) | |
switched from substr() to rtrim() in _write_headers() so that the last $this->newline is fully stripped when the "mail" protocol is used, regardless of whether \r, \n, or \r\n is used.
http://codeigniter.com/bug_tracker/bug/6669/
| -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> |