Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #823 from Vespakoen/patch-3 

ATTENTION! Fixing reference issue in relationship matching (Causing MAMP, and other installs, to crash when eager-loading)
This commit is contained in:
Taylor Otwell 2012-06-16 13:06:11 -07:00
parent b27b132128 aeeb010e0a
commit 527977337d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/eloquent/relationships/belongs_to.php
View File

@ -89,7 +89,7 @@ public function match($relationship, &$children, $parents)
foreach ($children as &$child) foreach ($children as &$child)
{ {
$parent = array_first($parents, function($k, $v) use ($child, $foreign) $parent = array_first($parents, function($k, $v) use (&$child, $foreign)
{ {
return $v->get_key() == $child->$foreign; return $v->get_key() == $child->$foreign;
}); });

2
laravel/database/eloquent/relationships/has_many.php
View File

@ -93,7 +93,7 @@ public function match($relationship, &$parents, $children)
foreach ($parents as &$parent) foreach ($parents as &$parent)
{ {
$matching = array_filter($children, function($v) use ($parent, $foreign) $matching = array_filter($children, function($v) use (&$parent, $foreign)
{ {
return $v->$foreign == $parent->get_key(); return $v->$foreign == $parent->get_key();
}); });

2
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@ -327,7 +327,7 @@ public function match($relationship, &$parents, $children)
foreach ($parents as &$parent) 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(); return $v->pivot->$foreign == $parent->get_key();
}); });

2
laravel/database/eloquent/relationships/has_one.php
View File

@ -40,7 +40,7 @@ public function match($relationship, &$parents, $children)
foreach ($parents as &$parent) foreach ($parents as &$parent)
{ {
$matching = array_first($children, function($k, $v) use ($parent, $foreign) $matching = array_first($children, function($k, $v) use (&$parent, $foreign)
{ {
return $v->$foreign == $parent->get_key(); return $v->$foreign == $parent->get_key();
}); });