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

traits目录移动到library下面

Browse Source
This commit is contained in:
thinkphp
2015-12-11 14:14:24 +08:00
parent 73d75227a9
commit ebc26f9043
9 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/loader.php
View File

@@ -30,7 +30,7 @@ class Loader
if (isset(self::$namespace[$name])) {
// 注册的命名空间
$path = dirname(self::$namespace[$name]) . DS;
} elseif (in_array($name, ['think', 'org', 'behavior', 'com']) || is_dir(LIB_PATH . $name)) {
} elseif (in_array($name, ['think', 'org', 'behavior', 'com', 'traits']) || is_dir(LIB_PATH . $name)) {
// Library目录下面的命名空间自动定位
$path = LIB_PATH;
} else {
@@ -89,10 +89,10 @@ class Loader
//加载当前项目应用类库
$class = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
$baseUrl = MODULE_PATH;
} elseif (in_array($class_strut[0], ['think', 'behavior', 'org', 'com'])) {
} elseif (in_array($class_strut[0], ['traits', 'think', 'behavior', 'org', 'com'])) {
// org 第三方公共类库 com 企业公共类库
$baseUrl = LIB_PATH;
} elseif (in_array($class_strut[0], ['vendor', 'traits'])) {
} elseif (in_array($class_strut[0], ['vendor'])) {
$baseUrl = THINK_PATH;
} else {
// 加载其他项目应用类库