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

fixed merge conflicts.

This commit is contained in:
Taylor Otwell 2011-09-14 20:58:27 -05:00
parent 6becbaba51 6904cf119d
commit 5196d015b8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,16 +201,6 @@ public static function find($id)
return static::query(get_called_class())->where('id', '=', $id)->first();
}
/**
* Get the first model result
*
* @return mixed
*/
private function _first()
{
return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
}
/**
* Get an array of models from the database.
*
@ -221,6 +211,16 @@ private function _get()
return Hydrator::hydrate($this);
}
/**
* Get the first model result
*
* @return mixed
*/
private function _first()
{
return (count($results = $this->take(1)->_get()) > 0) ? reset($results) : null;
}
/**
* Retrieve the query for a 1:1 relationship.
*