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

改进异常语言包的加载

Browse Source
This commit is contained in:
thinkphp
2016-06-16 17:01:19 +08:00
parent 744fa08329
commit ef05d5f44b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Route.php
View File

@@ -926,8 +926,7 @@ class Route
if ($option['after_behavior'] instanceof \Closure) { if ($option['after_behavior'] instanceof \Closure) {
$result = call_user_func_array($option['after_behavior'], [$route]); $result = call_user_func_array($option['after_behavior'], [$route]);
} else { } else {
$behaviors = (array)$option['after_behavior']; foreach((array)$option['after_behavior'] as $behavior){
foreach($behaviors as $behavior){
$result = Hook::exec($behavior, '', $route); $result = Hook::exec($behavior, '', $route);
if (!is_null($result)) { if (!is_null($result)) {
break; break;

5
library/think/exception/Handle.php
View File

@@ -203,7 +203,10 @@ class Handle
return $message; 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,':')) { if (strpos($message,':')) {
$name = strstr($message, ':', true); $name = strstr($message, ':', true);
return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message; return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message;