minor tweak

RafaelFontes · Mar 12, 2012 · cfa35f5 · cfa35f5
1 parent a34288d
commit cfa35f5
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -787,14 +787,13 @@ private function computeChangeSet(ClassMetadata $class, $document)
         }
 
         $oid = spl_object_hash($document);
-        if (!isset($this->originalData[$oid])) {
+        $isNew = !isset($this->originalData[$oid]);
+
+        if ($isNew) {
             // Document is New and should be inserted
             $this->originalData[$oid] = $actualData;
             $this->documentChangesets[$oid] = $actualData;
             $this->scheduledInserts[$oid] = $document;
-            $computeChanges = false;
-        } else {
-            $computeChanges = true;
         }
 
         if ($class->parentMapping && isset($actualData[$class->parentMapping])) {
@@ -831,15 +830,7 @@ private function computeChangeSet(ClassMetadata $class, $document)
             }
         }
 
-        foreach ($class->referrersMappings as $name => $referrerMapping) {
-            if ($this->originalData[$oid][$name]) {
-                foreach ($this->originalData[$oid][$name] as $referrer) {
-                    $this->computeReferrerChanges($referrer);
-                }
-            }
-        }
-
-        if ($computeChanges) {
+        if (!$isNew) {
             if (isset($this->originalData[$oid][$class->nodename])
                 && isset($actualData[$class->nodename])
                 && $this->originalData[$oid][$class->nodename] !== $actualData[$class->nodename]
@@ -894,6 +885,14 @@ private function computeChangeSet(ClassMetadata $class, $document)
                 $this->documentChangesets[$oid] = $actualData;
                 $this->scheduledUpdates[$oid] = $document;
             }
+
+            foreach ($class->referrersMappings as $name => $referrerMapping) {
+                if ($this->originalData[$oid][$name]) {
+                    foreach ($this->originalData[$oid][$name] as $referrer) {
+                        $this->computeReferrerChanges($referrer);
+                    }
+                }
+            }
         }
     }