From 42ec3c949cca79ff57edb6e784157a3ec615efb5 Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Wed, 9 Apr 2008 14:31:25 +0000
Subject: [PATCH] Merged r4208 into trunk and jepso branch

---
 lib/Doctrine/Record.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index f8cedd195..6f804493c 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -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);