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 /system/database | |
| parent | 74496c268ae7199082cad86e0fea65687d78a2c9 (diff) | |
| parent | 8af76666474c42b45518c08bec16b4f8d700dd3c (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 4 |
1 files changed, 2 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; } // -------------------------------------------------------------------- |