From 46fdf4aa1454d6d300e9aff178e86c31782f04df Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 21 Dec 2015 19:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=89=A9=E5=B1=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/app.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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