Merged r4208 into trunk and jepso branch
This commit is contained in:
parent
78492f3c9a
commit
42ec3c949c
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user