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

修正Loader::import

Browse Source
This commit is contained in:
yunwuxin
2016-06-29 18:28:11 +08:00
parent f1097b138a
commit 207a77420e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Loader.php
View File

@@ -253,16 +253,18 @@ class Loader
public static function import($class, $baseUrl = '', $ext = EXT) public static function import($class, $baseUrl = '', $ext = EXT)
{ {
static $_file = []; static $_file = [];
$key = $class . $baseUrl;
$class = str_replace(['.', '#'], [DS, '.'], $class); $class = str_replace(['.', '#'], [DS, '.'], $class);
if (isset($_file[$class . $baseUrl])) { if (isset($_file[$key])) {
return true; return true;
} }
if (empty($baseUrl)) { if (empty($baseUrl)) {
list($name, $class) = explode(DS, $class, 2); list($name, $class) = explode(DS, $class, 2);
if (isset(self::$prefixDirsPsr4[$name])) {
if (isset(self::$prefixDirsPsr4[$name . '\\'])) {
// 注册的命名空间 // 注册的命名空间
$baseUrl = self::$prefixDirsPsr4[$name]; $baseUrl = self::$prefixDirsPsr4[$name . '\\'];
} elseif ('@' == $name) { } elseif ('@' == $name) {
//加载当前模块应用类库 //加载当前模块应用类库
$baseUrl = App::$modulePath; $baseUrl = App::$modulePath;
@@ -293,7 +295,7 @@ class Loader
return false; return false;
} }
includeFile($filename); includeFile($filename);
$_file[$class . $baseUrl] = true; $_file[$key] = true;
return true; return true;
} }
return false; return false;