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

This commit is contained in:
Chris Berthe
2012-06-18 12:38:59 -04:00
9 changed files with 22 additions and 7 deletions

View File

@@ -89,7 +89,7 @@ class Belongs_To extends Relationship {
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;
});

View File

@@ -93,7 +93,7 @@ class Has_Many extends Has_One_Or_Many {
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();
});

View File

@@ -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();
});

View File

@@ -40,7 +40,7 @@ class Has_One extends Has_One_Or_Many {
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();
});