summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-05 20:38:08 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-05 20:38:08 +0100
commit567474528e0c1a4e305dbe8787b83e526b46eb02 (patch)
tree46ad64ce5d20074763bf474d122f315f4deadbff
parent68c0173c33db7e27487097994d1c319b588484ee (diff)
Moved change log entry from 2.1.1 to 3.0.
-rw-r--r--user_guide_src/source/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2f525b10a..683dd5516 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -140,6 +140,7 @@ Bug fixes for 3.0
- Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
- Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
- Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
+- Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
Version 2.1.1
=============
@@ -158,7 +159,6 @@ Release Date: Not Released
Bug fixes for 2.1.1
-------------------
-- Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
- Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.
- Fixed a bug - form_open() compared $action against site_url() instead of base_url().
- Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.