Doctrine

Timestamp:

02/15/08 13:39:08 (2 years ago)

Author:

jwage

Message:

Fixed order of if else to match 0.9

Files:

• branches/0.10/lib/Doctrine/Data/Import.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Data/Import.php

@@ -131 +131 @@
             if ($obj->getTable()->hasField($key)) {
                 $obj->set($key, $value);
+            } else if (method_exists($obj, 'set' . Doctrine::classify($key))) {
+                    $func = 'set' . Doctrine::classify($key);
+                    $obj->$func($value);
             } else if ($obj->getTable()->hasRelation($key)) {
                 if (is_array($value)) {
@@ -150 +153 @@
                     $obj->set($key, $this->_getImportedObject($value));
                 }
-            } else if (method_exists($obj, 'set' . Doctrine::classify($key))) {
-                $func = 'set' . Doctrine::classify($key);
-                $obj->$func($value);
             }
         }