From 8dfb389f2009ea6372ae64e4da9c0f399a64e4db Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 10 Feb 2016 10:22:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/App.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/think/App.php b/library/think/App.php index 2fe56c13..e7ae61cf 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -31,14 +31,6 @@ class App // 初始化应用（公共模块） self::initModule(COMMON_MODULE, Config::get()); - // 读取扩展配置文件 - if (Config::get('extra_config_list')) { - foreach (Config::get('extra_config_list') as $name => $file) { - $file = strpos($file, '.') ? $file : APP_PATH . $file . EXT; - Config::load($file, is_string($name) ? $name : pathinfo($file, PATHINFO_FILENAME)); - } - } - // 获取配置参数 $config = Config::get(); @@ -299,11 +291,19 @@ class App } else { $path = APP_PATH . $module; // 加载模块配置 - Config::load(APP_PATH . $module . 'config' . EXT); + $config = Config::load(APP_PATH . $module . 'config' . EXT); // 加载应用状态配置 if ($config['app_status']) { - Config::load(APP_PATH . $module . $config['app_status'] . EXT); + $config = Config::load(APP_PATH . $module . $config['app_status'] . EXT); + } + + // 读取扩展配置文件 + if ($config['extra_config_list']) { + foreach ($config['extra_config_list'] as $name => $file) { + $file = strpos($file, '.') ? $file : $path . $file . EXT; + Config::load($file, is_string($name) ? $name : pathinfo($file, PATHINFO_FILENAME)); + } } // 加载别名文件