Refactor getting relations from collection's model

geometria-lab · Dec 29, 2012 · fdd62de · fdd62de
1 parent d3c394b
commit fdd62de
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/library/GeometriaLab/Model/Persistent/Collection.php b/library/GeometriaLab/Model/Persistent/Collection.php
@@ -19,14 +19,13 @@ public function fetchRelations($relationNames = null, $refresh = false)
                 return $this;
             }
 
-            foreach ($relations as $relation) {
+            $relationNames = array_map(function($relation) {
-                /* @var \GeometriaLab\Model\Persistent\Relation\AbstractRelation $relation */
+                return null;
-                $relationNames[$relation->getProperty()->getName()] = null;
+            }, $relations);
-            }
-        } else {
-            $relationNames = $this->parseRelationNames($relationNames);
         }
 
+        $relationNames = $this->parseRelationNames($relationNames);
+
         foreach ($relationNames as $relationName => $childRelations) {
             $relation = $this->getRelation($relationName);
             if ($relation !== null) {