fixes #420

635f1a9c · zYne · 46154c56 · 635f1a9c
Commit 635f1a9c authored Aug 13, 2007 by zYne
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Record.php lib/Doctrine/Record.php +4 -4

No files found.
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -838,13 +838,13 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count

        $lower = $this->_table->getColumnName($lower);

+        if (isset($this->_data[$lower])) {
+            if ($value instanceof Doctrine_Record) {
                $type = $this->_table->getTypeOf($name);

-        if (isset($this->_data[$lower])) {
-            if ($value instanceof Doctrine_Record && $type != 'object') {
                $id = $value->getIncremented();

-                if ($id !== null) {
+                if ($id !== null && $type !== 'object') {
                    $value = $id;
                }
            }