diff options
author | Derek Jones <derek.jones@ellislab.com> | 2010-03-11 16:13:34 +0100 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2010-03-11 16:13:34 +0100 |
commit | cf579558fa8c1e20af748146e4fe196d7c772c34 (patch) | |
tree | 2819713c70ae9bac26c9a4801337c48a40d00c56 /system/database | |
parent | 2ede2f6e8e9f2cde7402a88906d091011f7885ec (diff) |
full on scaffolding removal
Diffstat (limited to 'system/database')
-rw-r--r-- | system/database/DB_active_rec.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 88690a8f9..3e9923e6f 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1916,7 +1916,7 @@ class CI_DB_active_record extends CI_DB_driver { foreach (get_object_vars($object) as $key => $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') + if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name') { $array[$key] = $val; } @@ -1950,7 +1950,7 @@ class CI_DB_active_record extends CI_DB_driver { foreach ($fields as $val) { // There are some built in keys we need to ignore for this conversion - if ($val != '_parent_name' && $val != '_ci_scaffolding' && $val != '_ci_scaff_table') + if ($val != '_parent_name') { $i = 0; |