summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-08 19:46:04 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-08 19:46:04 +0200
commit509885932928b34f22091b59b014ec16c52b4bbe (patch)
tree86f4ab973ceae3ea6a76d4650f37da045e1d5516
parent60e719bd73cb490cc5c6c2df51823d06c00e973f (diff)
[ci skip] Polish changes from pull #1709
-rw-r--r--system/libraries/Email.php2
-rw-r--r--user_guide_src/source/changelog.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 4adf9430f..36bdd1f22 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1861,4 +1861,4 @@ class CI_Email {
}
/* End of file Email.php */
-/* Location: ./system/libraries/Email.php */
+/* Location: ./system/libraries/Email.php */ \ No newline at end of file
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 50bf2c304..3e1cfcac4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -243,7 +243,6 @@ Release Date: Not Released
Bug fixes for 3.0
------------------
-- Fixed a bug (#1709) where the email headers were broken when using long email subjects and \r\n as crlf.
- Fixed a bug where ``unlink()`` raised an error if cache file did not exist when you try to delete it.
- Fixed a bug (#181) where a mis-spelling was in the form validation language file.
- Fixed a bug (#159, #163) that mishandled Query Builder nested transactions because _trans_depth was not getting incremented.
@@ -360,6 +359,7 @@ Bug fixes for 3.0
- Fixed a bug (#1745) - ``is_write_type()`` method in the :doc:`Database Library <database/index>` didn't return TRUE for LOAD queries.
- Fixed a bug (#1765) - :doc:`Database Library <database/index>` didn't properly detect connection errors for MySQLi.
- Fixed a bug (#1257) - :doc:`Query Builder <database/query_builder>` used to (unnecessarily) group FROM clause contents, which breaks certain queries and is invalid for some databases.
+- Fixed a bug (#1709) - :doc:`Email <libraries/email>` headers were broken when using long email subjects and \r\n as CRLF.
Version 2.1.2
=============