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

改进Config类支持配置CONF_EXT常量

Browse Source
This commit is contained in:
thinkphp
2016-05-10 14:39:47 +08:00
parent 85fe5d89fe
commit 822d9a235b
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/App.php
View File

@@ -263,17 +263,17 @@ class App
} else {
$path = APP_PATH . $module;
// 加载模块配置
$config = Config::load(APP_PATH . $module . 'config' . EXT);
$config = Config::load(APP_PATH . $module . 'config' . CONF_EXT);
// 加载应用状态配置
if ($config['app_status']) {
$config = Config::load(APP_PATH . $module . $config['app_status'] . EXT);
$config = Config::load(APP_PATH . $module . $config['app_status'] . CONF_EXT);
}
// 读取扩展配置文件
if ($config['extra_config_list']) {
foreach ($config['extra_config_list'] as $name => $file) {
$filename = $path . $file . EXT;
$filename = $path . $file . CONF_EXT;
Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
}
}