Browse Source

Merge pull request #1322 from vFragosop/eloquent/relationship_performance

Fixing has_one iterations
Taylor Otwell 12 years ago
parent
commit
1df8fa91fc
1 changed files with 4 additions and 2 deletions
  1. 4 2
      laravel/database/eloquent/relationships/has_one.php

+ 4 - 2
laravel/database/eloquent/relationships/has_one.php

@@ -41,18 +41,20 @@ class Has_One extends Has_One_Or_Many {
 		$children_hash = array();
 		foreach ($children as $child)
 		{
-			if (array_key_exists($child->pivot->$foreign, $children_hash))
+			if (array_key_exists($child->$foreign, $children_hash))
 			{
 				continue;
 			}
 
-			$children_hash[$child->pivot->$foreign] = $child;
+			$children_hash[$child->$foreign] = $child;
 		}
 
 		foreach ($parents as $parent)
 		{
 			if (array_key_exists($parent->get_key(), $children_hash))
+			{
 				$parent->relationships[$relationship] = $children_hash[$parent->get_key()];
+			}
 		}
 	}