molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新

Browse Source
This commit is contained in:
molong
2016-08-16 16:14:36 +08:00
parent ebde0fc13e
commit 81a25be484
25 changed files with 340 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/library/think/exception/Handle.php
View File

@@ -14,7 +14,6 @@ namespace think\exception;
use Exception;
use think\App;
use think\Config;
use think\Console;
use think\console\Output;
use think\Lang;
use think\Log;
@@ -91,7 +90,7 @@ class Handle
if (App::$debug) {
$output->setVerbosity(Output::VERBOSITY_DEBUG);
}
(new Console)->renderException($e, $output);
$output->renderException($e);
}
/**
@@ -210,11 +209,15 @@ class Handle
}
if (strpos($message, ':')) {
$name = strstr($message, ':', true);
return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message;
} else {
return Lang::has($message) ? Lang::get($message) : $message;
$name = strstr($message, ':', true);
$message = Lang::has($name) ? Lang::get($name) . strstr($message, ':') : $message;
} elseif (strpos($message, ',')) {
$name = strstr($message, ',', true);
$message = Lang::has($name) ? Lang::get($name) . ':' . substr(strstr($message, ','), 1) : $message;
} elseif (Lang::has($message)) {
$message = Lang::get($message);
}
return $message;
}
/**