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;