molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新内核

Browse Source
This commit is contained in:
龙渊
2016-11-18 11:14:26 +08:00
parent 9074eb1d89
commit 860da138c9
36 changed files with 754 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/library/think/Loader.php
+8 -7
View File
@@ -365,8 +365,9 @@ class Loader
*/
public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
{
if (isset(self::$instance[$name . $layer])) {
return self::$instance[$name . $layer];
$guid = $name . $layer;
if (isset(self::$instance[$guid])) {
return self::$instance[$guid];
}
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name, 2);
@@ -384,7 +385,7 @@ class Loader
throw new ClassNotFoundException('class not exists:' . $class, $class);
}
}
self::$instance[$name . $layer] = $model;
self::$instance[$guid] = $model;
return $model;
}
@@ -427,9 +428,9 @@ class Loader
if (empty($name)) {
return new Validate;
}
if (isset(self::$instance[$name . $layer])) {
return self::$instance[$name . $layer];
$guid = $name . $layer;
if (isset(self::$instance[$guid])) {
return self::$instance[$guid];
}
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name);
@@ -447,7 +448,7 @@ class Loader
throw new ClassNotFoundException('class not exists:' . $class, $class);
}
}
self::$instance[$name . $layer] = $validate;
self::$instance[$guid] = $validate;
return $validate;
}