Commit 3639d2c4 authored by Daniel Bondergaard's avatar Daniel Bondergaard

Fixed pivot model hydration loading in Eloquent2

Signed-off-by: 's avatarDaniel Bondergaard <danielboendergard@gmail.com>
parent 263d6145
...@@ -290,19 +290,17 @@ class Has_Many_And_Belongs_To extends Relationship { ...@@ -290,19 +290,17 @@ class Has_Many_And_Belongs_To extends Relationship {
// the pivot table that may need to be accessed by the developer. // the pivot table that may need to be accessed by the developer.
$pivot = new Pivot($this->joining); $pivot = new Pivot($this->joining);
$attributes = array_filter($result->attributes, function($attribute)
{
return starts_with($attribute, 'pivot_');
});
// If the attribute key starts with "pivot_", we know this is a column on // If the attribute key starts with "pivot_", we know this is a column on
// the pivot table, so we will move it to the Pivot model and purge it // the pivot table, so we will move it to the Pivot model and purge it
// from the model since it actually belongs to the pivot. // from the model since it actually belongs to the pivot.
foreach ($attributes as $key => $value) foreach ($result->attributes as $key => $value)
{ {
$pivot->{substr($key, 6)} = $value; if (starts_with($key, 'pivot_'))
{
$pivot->{substr($key, 6)} = $value;
$result->purge($key); $result->purge($key);
}
} }
// Once we have completed hydrating the pivot model instance, we'll set // Once we have completed hydrating the pivot model instance, we'll set
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment