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

改进Model类的useGlobalScope方法调用后的全局影响

Browse Source
This commit is contained in:
thinkphp
2016-12-21 12:22:24 +08:00
parent 6bd6d03440
commit a981277c66
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/Model.php
View File

@@ -1188,7 +1188,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function useGlobalScope($use) public static function useGlobalScope($use)
{ {
$model = new static(); $model = new static();
self::$db = $model->db($use); static::$db = $model->db($use);
return $model; return $model;
} }
@@ -1461,9 +1461,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
if (isset(static::$db)) { if (isset(static::$db)) {
$query = static::$db; $query = static::$db;
static::$db = null;
} else { } else {
$query = $this->db(); $query = $this->db();
} }
if (method_exists($this, 'scope' . $method)) { if (method_exists($this, 'scope' . $method)) {
// 动态调用命名范围 // 动态调用命名范围
$method = 'scope' . $method; $method = 'scope' . $method;
@@ -1479,6 +1481,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
if (isset(static::$db)) { if (isset(static::$db)) {
$query = static::$db; $query = static::$db;
static::$db = null;
} else { } else {
$query = (new static())->db(); $query = (new static())->db();
} }