Commit b097b6c6 authored by Taylor Otwell's avatar Taylor Otwell

Fix to_array() in eloquent model.

parent f8fe7843
......@@ -607,7 +607,7 @@ abstract class Model {
// 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
// array of existing regular attributes we gathered.
if ( ! is_array($models))
if ($models instanceof Model)
{
$attributes[$name] = $models->to_array();
}
......@@ -615,13 +615,17 @@ abstract class Model {
// If the relationship is a "to-many" relationship we need to spin
// through each of the related models and add each one with the
// to_array method, keying them both by name and ID.
else
elseif (is_array($models))
{
foreach ($models as $id => $model)
{
$attributes[$name][$id] = $model->to_array();
}
}
elseif (is_null($models))
{
$attributes[$name] = $models;
}
}
return $attributes;
......
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