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

Merge branch 'develop' of github.com:laravel/laravel into develop

Browse Source
This commit is contained in:
Taylor Otwell
2012-06-03 17:37:05 -05:00
parent 1ac911f05d 930a3e89e0
commit d9c0dc0c35
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,11 +230,9 @@ abstract class Model {
* @param array $columns
* @return Model
*/
public static function find($id, $columns = array('*'))
public function _find($id, $columns = array('*'))
{
$model = new static;
return $model->query()->where(static::$key, '=', $id)->first($columns);
return $this->query()->where(static::$key, '=', $id)->first($columns);
}
/**
@@ -746,10 +744,12 @@ abstract class Model {
return static::$$method;
}
$underscored = array('with', 'find');
// Some methods need to be accessed both staticly and non-staticly so we'll
// keep underscored methods of those methods and intercept calls to them
// here so they can be called either way on the model instance.
if (in_array($method, array('with')))
if (in_array($method, $underscored))
{
return call_user_func_array(array($this, '_'.$method), $parameters);
}