mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2017-04-01 11:00:17 +08:00
parent 164b7521c5 a489f99ef4
commit f72ff880dd
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/Model.php
View File

@@ -1812,16 +1812,27 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
}
public static function __callStatic($method, $params)
public static function __callStatic($method, $args)
{
$model = new static();
if (isset(static::$db)) {
$query = static::$db;
static::$db = null;
} else {
$query = (new static())->db();
$query = $model->db();
}
return call_user_func_array([$query, $method], $params);
if (method_exists($model, 'scope' . $method)) {
// 动态调用命名范围
$method = 'scope' . $method;
array_unshift($args, $query);
call_user_func_array([$model, $method], $args);
return $query;
} else {
return call_user_func_array([$query, $method], $args);
}
}
/**