diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-05 13:35:13 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-05 13:35:13 +0100 |
| commit | f24d30aee7ca0e007ad428a920d0a52cddb05282 (patch) | |
| tree | 3c11a9b327184863654f3825756fd9a6ebe1af44 | |
| parent | 74496c268ae7199082cad86e0fea65687d78a2c9 (diff) | |
| parent | 8af76666474c42b45518c08bec16b4f8d700dd3c (diff) | |
Merge upstream branch
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index a6e3dd7eb..2217e974e 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -263,11 +263,11 @@ class CI_DB_odbc_driver extends CI_DB { /** * Insert ID * - * @return int + * @return bool */ public function insert_id() { - return @odbc_insert_id($this->conn_id); + return ($this->db->db_debug) ? $this->db->display_error('db_unsuported_feature') : FALSE; } // -------------------------------------------------------------------- diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b3b81a349..45e6bfcd3 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -138,6 +138,7 @@ Bug fixes for 3.0 - Fixed a bug in Oracle's :doc:`Database Forge Class <database/forge>` method _create_table() where it failed with AUTO_INCREMENT as it's not supported. - Fixed a bug (#1080) - When using the SMTP protocol, the :doc:`Email Library <libraries/email>` send() method was returning TRUE even if the connection/authentication against the server failed. - 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. Version 2.1.1 ============= |