From 3ec6e42183f03076c4774e591d262a04dd39f509 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 1 Oct 2016 10:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=AF=AD=E8=A8=80=E5=8C=85?=
 =?UTF-8?q?=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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index 573e1289..7e140ca9 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -103,10 +103,10 @@ class App
             }
             $request->langset(Lang::range());
             // 加载系统语言包
-            Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT);
-            if (!$config['app_multi_module']) {
-                Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT);
-            }
+            Lang::load([
+                THINK_PATH . 'lang' . DS . $request->langset() . EXT,
+                APP_PATH . 'lang' . DS . $request->langset() . EXT,
+            ]);
 
             // 获取应用调度信息
             $dispatch = self::$dispatch;