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

Fix to_array() in eloquent model.

This commit is contained in:
Taylor Otwell 2012-05-11 13:22:04 -05:00
parent f8fe7843ab
commit b097b6c682
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
laravel/database/eloquent/model.php
View File

@ -607,7 +607,7 @@ public function to_array()
// If the relationship is not a "to-many" relationship, we can just // If the relationship is not a "to-many" relationship, we can just
// to_array the related model and add it as an attribute to the // to_array the related model and add it as an attribute to the
// array of existing regular attributes we gathered. // array of existing regular attributes we gathered.
if ( ! is_array($models)) if ($models instanceof Model)
{ {
$attributes[$name] = $models->to_array(); $attributes[$name] = $models->to_array();
} }
@ -615,13 +615,17 @@ public function to_array()
// If the relationship is a "to-many" relationship we need to spin // If the relationship is a "to-many" relationship we need to spin
// through each of the related models and add each one with the // through each of the related models and add each one with the
// to_array method, keying them both by name and ID. // to_array method, keying them both by name and ID.
else elseif (is_array($models))
{ {
foreach ($models as $id => $model) foreach ($models as $id => $model)
{ {
$attributes[$name][$id] = $model->to_array(); $attributes[$name][$id] = $model->to_array();
} }
} }
elseif (is_null($models))
{
$attributes[$name] = $models;
}
} }
return $attributes; return $attributes;