summaryrefslogtreecommitdiffstats
path: root/system/database
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 /system/database
parent38a8cffe67cd89ff947d2058a728781f7f3a103b (diff)
parent56514f1de740ff72198228a10deab8f9da2dfe13 (diff)
Merge pull request #3854 from leandrowkz/develop
Fixed bug - using field_data() on Oracle databases
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/oci8/oci8_driver.php2
1 files changed, 1 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;