Merge remote-tracking branch 'upstream/develop' into develop

2012-06-18 12:38:59 -04:00
parent 8e5f1dd6f7 681f80eafb
commit 17e75a9719
9 changed files with 22 additions and 7 deletions
--- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
+++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php
@@ -327,7 +327,7 @@ class Has_Many_And_Belongs_To extends Relationship {

 		foreach ($parents as &$parent)
 		{
-			$matching = array_filter($children, function($v) use ($parent, $foreign)
+			$matching = array_filter($children, function($v) use (&$parent, $foreign)
 			{
 				return $v->pivot->$foreign == $parent->get_key();
 			});