diff --git a/Adapter/Adapter_EntityMapper.php b/Adapter/Adapter_EntityMapper.php index a164c1579..e489cf13f 100644 --- a/Adapter/Adapter_EntityMapper.php +++ b/Adapter/Adapter_EntityMapper.php @@ -59,6 +59,7 @@ class Adapter_EntityMapper } if ($object_datas = Db::getInstance()->getRow($sql)) { + $objectVars = get_object_vars($entity); if (!$id_lang && isset($entity_defs['multilang']) && $entity_defs['multilang']) { $sql = 'SELECT * FROM `' . bqSQL(_DB_PREFIX_ . $entity_defs['table']) . '_lang` @@ -68,7 +69,7 @@ class Adapter_EntityMapper if ($object_datas_lang = Db::getInstance()->executeS($sql)) { foreach ($object_datas_lang as $row) { foreach ($row as $key => $value) { - if ($key != $entity_defs['primary'] && array_key_exists($key, $entity)) { + if ($key != $entity_defs['primary'] && array_key_exists($key, $objectVars)) { if (!isset($object_datas[$key]) || !is_array($object_datas[$key])) { $object_datas[$key] = array(); } @@ -81,7 +82,9 @@ class Adapter_EntityMapper } $entity->id = (int)$id; foreach ($object_datas as $key => $value) { - if (array_key_exists($key, $entity)) { + //if (array_key_exists($key, $entity)) { + if (array_key_exists($key, $entity_defs['fields']) + || array_key_exists($key, $objectVars)) { $entity->{$key} = $value; } else { unset($object_datas[$key]);