1
0
mirror of synced 2025-01-18 06:21:40 +03:00

Merged r4208 into trunk and jepso branch

This commit is contained in:
guilhermeblanco 2008-04-09 14:31:25 +00:00
parent 78492f3c9a
commit 42ec3c949c

View File

@ -1341,7 +1341,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
{
if (is_array($array)) {
foreach ($array as $key => $value) {
if ($this->getTable()->hasRelation($key) && $deep) {
if ($deep && $this->getTable()->hasRelation($key)) {
$this->$key->fromArray($value, $deep);
} else if ($this->getTable()->hasField($key)) {
$this->set($key, $value);