From cd38d6774bf11bab8e2a07f861c876097a287f59 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 12:49:40 -0400 Subject: Merged with develop and updated to new changelog. --- user_guide_src/source/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index a6a2683aa..ba6aaaac8 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -46,6 +46,8 @@ Release Date: Not Released $this->db->like() in the :doc:`Database Driver `. - Added $this->db->insert_batch() support to the OCI8 (Oracle) driver. + - Fixed a bug (#200) where MySQL queries would be malformed after calling + `count_all()` then `db->get()`. - Libraries @@ -108,6 +110,8 @@ Bug fixes for 2.1.0 - Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php). - Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection. - Fixed a bug (#537) - Support for all wav type in browser. +- Fixed a bug (#200) - MySQL queries would be malformed after calling + count_all() then db->get(). Version 2.0.3 ============= -- cgit v1.2.3-24-g4f1b From d08aa31a8b578a2e6687be4c9fe864fe08bd66d6 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 13:56:54 -0300 Subject: Ooops, removed duplicate entry in changelog. --- user_guide_src/source/changelog.rst | 2 -- 1 file changed, 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index ba6aaaac8..b844fdcc6 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -46,8 +46,6 @@ Release Date: Not Released $this->db->like() in the :doc:`Database Driver `. - Added $this->db->insert_batch() support to the OCI8 (Oracle) driver. - - Fixed a bug (#200) where MySQL queries would be malformed after calling - `count_all()` then `db->get()`. - Libraries -- cgit v1.2.3-24-g4f1b From 6f1fa5e6e40ae35bb8eeec359cb9f830b832c572 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 15:13:39 -0300 Subject: Fixed new line typo. --- user_guide_src/source/changelog.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'user_guide_src/source') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b844fdcc6..7b89f1782 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -108,8 +108,7 @@ Bug fixes for 2.1.0 - Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php). - Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection. - Fixed a bug (#537) - Support for all wav type in browser. -- Fixed a bug (#200) - MySQL queries would be malformed after calling - count_all() then db->get(). +- Fixed a bug (#200) - MySQL queries would be malformed after calling count_all() then db->get(). Version 2.0.3 ============= -- cgit v1.2.3-24-g4f1b