优化config指令

This commit is contained in:
thinkphp
2016-07-22 18:31:45 +08:00
parent f8070ea8db
commit 253ccaaad0

View File

@@ -54,12 +54,12 @@ class Config extends Command
$config = \think\Config::load(CONF_PATH . $module . 'config' . CONF_EXT); $config = \think\Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
// 加载应用状态配置 // 加载应用状态配置
if ($config['app_status']) { if ($module && $config['app_status']) {
$config = \think\Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT); $config = \think\Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
} }
// 读取扩展配置文件 // 读取扩展配置文件
if ($config['extra_config_list']) { if ($module && $config['extra_config_list']) {
foreach ($config['extra_config_list'] as $name => $file) { foreach ($config['extra_config_list'] as $name => $file) {
$filename = CONF_PATH . $module . $file . CONF_EXT; $filename = CONF_PATH . $module . $file . CONF_EXT;
\think\Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME)); \think\Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));