summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 4bf3098d9..b9594050e 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -1202,7 +1202,9 @@ class CI_DB_active_record extends CI_DB_driver {
$array = array();
foreach (get_object_vars($object) as $key => $val)
{
- if ( ! is_object($val) AND ! is_array($val))
+ // There are some built in keys we need to ignore for this conversion
+ if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name' && $key != '_ci_scaffolding' && $key != '_ci_scaff_table')
+
{
$array[$key] = $val;
}