summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-05-13 18:00:43 +0200
committerAndrey Andreev <narf@devilix.net>2015-05-13 18:00:43 +0200
commit3a9eb39f61b10b3f86e50f4cd39ca0d9f010bac2 (patch)
tree1783dc5a17cc20ddede409e13984576bff274302
parent38a8cffe67cd89ff947d2058a728781f7f3a103b (diff)
parent56514f1de740ff72198228a10deab8f9da2dfe13 (diff)
Merge pull request #3854 from leandrowkz/develop
Fixed bug - using field_data() on Oracle databases
-rw-r--r--system/database/drivers/oci8/oci8_driver.php2
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 4010995a1..b5cf26536 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -573,7 +573,7 @@ class CI_DB_oci8_driver extends CI_DB {
{
$default = '';
}
- $retval[$i]->default = $query[$i]->COLUMN_DEFAULT;
+ $retval[$i]->default = $default;
}
return $retval;
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 185a17af4..15be738d6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,6 +28,7 @@ Bug fixes for 3.0.1
- Fixed a bug (#3816) - :doc:`Form Validation Library <libraries/form_validation>` treated empty string values as non-existing ones.
- Fixed a bug (#3823) - :doc:`Session Library <libraries/sessions>` drivers Redis and Memcached didn't properly handle locks that are blocking the request for more than 30 seconds.
- Fixed a bug (#3846) - :doc:`Image Manipulation Library <libraries/image_lib>` method `image_mirror_gd()` didn't properly initialize its variables.
+- Fixed a bug (#3854) - `field_data()` didn't work properly with the Oracle (OCI8) database driver.
Version 3.0.0
=============