summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-03-01 18:34:09 +0100
committerTimothy Warren <tim@timshomepage.net>2012-03-01 18:34:09 +0100
commiteabc5ec81209ec83393222f2964098aedf6dbc7a (patch)
tree1834fa8ca7b788d27cf0e916f9578d8bb8f1f999 /user_guide_src
parenta0da0b28bdb0ff73d5c0d9f8780ab0f6d74f39e3 (diff)
parente3a68042c086acfc98ae273adbd8527af0c6ab8b (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 51a451567..41ee28b1c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -120,6 +120,9 @@ Bug fixes for 3.0
- Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
- Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library <database/index>` didn't return TRUE for RENAME and OPTIMIZE queries.
- Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
+- Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
+- Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
+- Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
Version 2.1.1
=============
@@ -141,7 +144,6 @@ Bug fixes for 2.1.1
- Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
- Fixed a bug (#538) - Windows paths were ignored when using the :doc:`Image Manipulation Library <libraries/image_lib>` to create a new file.
-
Version 2.1.0
=============