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

app模式重构

Browse Source
This commit is contained in:
thinkphp
2015-09-26 20:45:09 +08:00
parent cb9faf2aa9
commit e58fa93b59
7 changed files with 210 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/error.php
View File

@@ -46,7 +46,7 @@ class Error {
switch ($errno) {
case E_USER_ERROR:
Log::record($errorStr, 'ERROR');
self::halt($errorStr);
self::halt($errorStr,$errno);
break;
case E_STRICT:
case E_USER_WARNING:
@@ -81,11 +81,12 @@ class Error {
/**
* 错误输出
* @param mixed $error 错误
* @param int $errno 错误代码
* @return void
*/
static public function halt($error) {
static public function halt($error,$code=1) {
$message = is_array($error)? $error['message'] : $error;
$code = is_array($error)? $error['code'] : 1;
$code = is_array($error)? $error['code'] : $code;
if(IS_CLI){
exit($message);
}elseif(IS_API){