From ef05d5f44b03cfb42e7343410389ee0737a3f229 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 16 Jun 2016 17:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=BC=82=E5=B8=B8=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=8C=85=E7=9A=84=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php            | 3 +--
 library/think/exception/Handle.php | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 6cb9c265..1912f470 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -926,8 +926,7 @@ class Route
                     if ($option['after_behavior'] instanceof \Closure) {
                         $result = call_user_func_array($option['after_behavior'], [$route]);
                     } else {
-                        $behaviors = (array)$option['after_behavior'];
-                        foreach($behaviors as $behavior){
+                        foreach((array)$option['after_behavior'] as $behavior){
                             $result = Hook::exec($behavior, '', $route);
                             if (!is_null($result)) {
                                 break;
diff --git a/library/think/exception/Handle.php b/library/think/exception/Handle.php
index a774ad6e..db8bd911 100644
--- a/library/think/exception/Handle.php
+++ b/library/think/exception/Handle.php
@@ -203,7 +203,10 @@ class Handle
             return $message;
         }
         // 导入语言包
-        Lang::load(THINK_PATH . 'lang' . DS . Lang::detect() . EXT);
+        if (!Config::get('lang_switch_on')) {
+            Lang::load(THINK_PATH . 'lang' . DS . Lang::detect() . EXT);
+        }
+        
         if (strpos($message,':')) {
             $name   = strstr($message, ':', true);
             return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message;