内核更新

This commit is contained in:
2016-09-01 22:03:02 +08:00
parent a12aba3512
commit 7381ce5ce7
15 changed files with 83 additions and 49 deletions

View File

@@ -12,6 +12,7 @@
namespace think;
use think\Config;
use think\Env;
use think\Exception;
use think\exception\HttpException;
use think\exception\HttpResponseException;
@@ -371,7 +372,7 @@ class App
self::$suffix = $config['class_suffix'];
// 应用调试模式
self::$debug = Config::get('app_debug');
self::$debug = Env::get('app_debug', Config::get('app_debug'));
if (!self::$debug) {
ini_set('display_errors', 'Off');
} elseif (!IS_CLI) {
@@ -448,11 +449,6 @@ class App
$config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
}
// 加载别名文件
if (is_file(CONF_PATH . $module . 'alias' . EXT)) {
Loader::addClassMap(include CONF_PATH . $module . 'alias' . EXT);
}
// 加载行为扩展文件
if (is_file(CONF_PATH . $module . 'tags' . EXT)) {
Hook::import(include CONF_PATH . $module . 'tags' . EXT);