|
@@ -230,11 +230,9 @@ abstract class Model {
|
|
* @param array $columns
|
|
* @param array $columns
|
|
* @return Model
|
|
* @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);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -749,7 +747,7 @@ abstract class Model {
|
|
// Some methods need to be accessed both staticly and non-staticly so we'll
|
|
// 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
|
|
// keep underscored methods of those methods and intercept calls to them
|
|
// here so they can be called either way on the model instance.
|
|
// here so they can be called either way on the model instance.
|
|
- if (in_array($method, array('with')))
|
|
|
|
|
|
+ if (in_array($method, array('with', 'find')))
|
|
{
|
|
{
|
|
return call_user_func_array(array($this, '_'.$method), $parameters);
|
|
return call_user_func_array(array($this, '_'.$method), $parameters);
|
|
}
|
|
}
|