bug

oscarotero · Jul 28, 2015 · 58aa13d · 58aa13d
1 parent eedd04c
commit 58aa13d
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/RowCollection.php b/src/RowCollection.php
@@ -85,7 +85,7 @@ public function __get($name)
 
             $collection = $this->select($name)->all();
 
-            if ($this->hasOne($name)) {
+            if ($this->entity->hasOne($name)) {
                 $this->joinOne($collection);
             } else {
                 $this->joinMany($collection);
@@ -402,6 +402,7 @@ public function joinMany(RowCollection $rows)
 
     /**
      * Distribute a rowcollection througth all rows.
+     * Its the opposite of $this->joinMany()
      *
      * @param RowCollection $rows
      *
@@ -412,16 +413,5 @@ public function joinOne(RowCollection $rows)
         $rows->joinMany($this);
 
         return $this;
-
-
-        $foreignKey = $rows->getEntity()->foreignKey;
-
-        foreach ($this->rows as $row) {
-            $id = $row->$foreignKey;
-
-            $row->$name = $rows[$id];
-        }
-
-        return $this;
     }
 }