diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2007-12-31 17:43:05 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2007-12-31 17:43:05 +0100 |
| commit | 848b77685de0346da3f9fb8614e59f7d11552e61 (patch) | |
| tree | 645f209edd2f8408d829a72504e8a13421377c0b /system/database | |
| parent | 9805f61a0aca60f3d01e89d1f3d66a2ce9ff3d83 (diff) | |
Fixed a bug in _object_to_array that broke some types of inserts and updates.
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_active_rec.php | 4 |
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;
}
|