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

Merge pull request #159 from WeakSun/patch-1

Browse Source 
修正scope方法$name参数传入array引起$names变量不存在的异常
This commit is contained in:
ThinkPHP
2016-06-26 10:37:00 +08:00
committed by GitHub
parent f80e82f491 f58aeede7a
commit a3359e778c
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
library/think/Model.php
View File

@@ -978,25 +978,27 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* 命名范围 * 命名范围
* @access public * @access public
* @param string|array|Closure $name 命名范围名称 逗号分隔 * @param string|array|Closure $name 命名范围名称 逗号分隔
* @param mixed $params 参数调用 * @param mixed ...$params 参数调用
* @return Model * @return Model
*/ */
public static function scope($name, $params = []) public static function scope($name)
{ {
$model = new static(); if ($name instanceof Query) {
$query = $model->db();
if ($name instanceof \Closure) {
call_user_func_array($name, [ & $query, $params]);
} elseif ($name instanceof Query) {
return $name; return $name;
} else { }
if (is_string($name)) { $model = new static();
$names = explode(',', $name); $params = func_get_args();
} $params[0] = $model->db();
foreach ($names as $scope) { if ($name instanceof \Closure) {
call_user_func_array($name, $params);
} elseif (is_string($name)) {
$name = explode(',', $name);
}
if (is_array($name)) {
foreach ($name as $scope) {
$method = 'scope' . trim($scope); $method = 'scope' . trim($scope);
if (method_exists($model, $method)) { if (method_exists($model, $method)) {
$model->$method($query, $params); call_user_func_array([$model, $method], $params);
} }
} }
} }