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

修正扩展配置文件的读取

Browse Source
This commit is contained in:
thinkphp
2015-12-21 19:38:01 +08:00
parent c2ac463a5c
commit 46fdf4aa14
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/app.php
View File

@@ -28,6 +28,9 @@ class App
// 初始化公共模块 // 初始化公共模块
self::initModule(COMMON_MODULE, $config); self::initModule(COMMON_MODULE, $config);
// 获取配置参数
$config = Config::get();
// 读取扩展配置文件 // 读取扩展配置文件
if ($config['extra_config_list']) { if ($config['extra_config_list']) {
foreach ($config['extra_config_list'] as $file) { foreach ($config['extra_config_list'] as $file) {
@@ -35,9 +38,6 @@ class App
} }
} }
// 获取配置参数
$config = Config::get();
// 日志初始化 // 日志初始化
Log::init($config['log']); Log::init($config['log']);
// 缓存初始化 // 缓存初始化
@@ -292,10 +292,10 @@ class App
$depr = $config['pathinfo_depr']; $depr = $config['pathinfo_depr'];
// 还原劫持后真实pathinfo // 还原劫持后真实pathinfo
$path_info = $path_info =
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') . (defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') . (defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') . (defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
$_SERVER['PATH_INFO']; $_SERVER['PATH_INFO'];
// 路由检测 // 路由检测
if (!empty($config['url_route_on'])) { if (!empty($config['url_route_on'])) {