自动根据环境变量识别是否调试模式

This commit is contained in:
thinkphp
2016-03-23 15:41:07 +08:00
parent 8cab3f1e58
commit eff3dd828c
4 changed files with 16 additions and 23 deletions

View File

@@ -28,9 +28,6 @@ class App
*/
public static function run()
{
// 加载环境变量配置文件
Config::loadEnv(APP_PATH . 'env' . EXT);
// 初始化应用(公共模块)
self::initModule(COMMON_MODULE, Config::get());
@@ -276,8 +273,8 @@ class App
// 读取扩展配置文件
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));
$filename = $path . $file . EXT;
Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
}
}