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

Loader类的import方法调整 Model类自动验证和自动完成改进callback类型

Browse Source
This commit is contained in:
thinkphp
2016-02-12 12:59:38 +08:00
parent 09486f2156
commit c70e329722
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Loader.php
View File

@@ -211,13 +211,13 @@ class Loader
} elseif ('@' == $name || MODULE_NAME == $name) {
//加载当前模块应用类库
$baseUrl = MODULE_PATH;
} elseif (in_array($name, ['traits', 'think', 'behavior']) || is_dir(LIB_PATH . $name)) {
} elseif (in_array($name, ['traits', 'think', 'behavior'])) {
$baseUrl = LIB_PATH;
} elseif (is_dir(EXTEND_PATH . $name)) {
$baseUrl = EXTEND_PATH;
} elseif (APP_NAMESPACE == $name) {
// 项目命名空间
$baseUrl = APP_PATH;
} elseif (is_dir(EXTEND_PATH . $name)) {
$baseUrl = EXTEND_PATH;
} else {
// 加载其他模块应用类库
$baseUrl = APP_PATH . $name . DS;