ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Berthe
2012-07-01 12:33:03 -04:00
parent f3d756476b 3ba5c00e5f
commit 3b6191ec16
9 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,14 +325,21 @@ class Has_Many_And_Belongs_To extends Relationship {
{
$foreign = $this->foreign_key();
$dictionary = array();
foreach ($children as $child)
{
$dictionary[$child->pivot->$foreign][] = $child;
}
foreach ($parents as &$parent)
{
$matching = array_filter($children, function($v) use (&$parent, $foreign)
{
return $v->pivot->$foreign == $parent->get_key();
});
$parent_key = $parent->get_key();
$parent->relationships[$relationship] = array_values($matching);
if (isset($dictionary[$parent_key]))
{
$parent->relationships[$relationship] = $dictionary[$parent_key];
}
}
}