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

修正错误

Browse Source
This commit is contained in:
thinkphp
2016-02-01 09:11:32 +08:00
parent 8130fbd0f6
commit 8f2055f72e
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Error.php
View File

@@ -13,7 +13,6 @@ namespace think;
use think\Exception; use think\Exception;
use think\exception\ErrorException; use think\exception\ErrorException;
use think\exception\NotFoundException;
class Error class Error
{ {
@@ -69,13 +68,13 @@ class Error
'Server/Request Data' => $_SERVER, 'Server/Request Data' => $_SERVER,
'Environment Variables' => $_ENV, 'Environment Variables' => $_ENV,
'ThinkPHP Constants' => self::getTPConst(), 'ThinkPHP Constants' => self::getTPConst(),
] ],
]; ];
} else { } else {
/* 部署模式仅显示 Code 和 Message */ /* 部署模式仅显示 Code 和 Message */
$data = [ $data = [
'code' => $exception->getCode(), 'code' => $exception->getCode(),
'message' => Config::get('show_error_msg') ? $exception->getMessage() : Config::get('error_message') 'message' => Config::get('show_error_msg') ? $exception->getMessage() : Config::get('error_message'),
]; ];
} }
@@ -137,7 +136,7 @@ class Error
* @param Array $vars 异常信息 * @param Array $vars 异常信息
* @return null * @return null
*/ */
public static function output(\Exception $exception, Array $vars) public static function output(\Exception $exception, array $vars)
{ {
if ($exception instanceof Exception) { if ($exception instanceof Exception) {
http_response_code($exception->getHttpStatus()); http_response_code($exception->getHttpStatus());
@@ -155,7 +154,7 @@ class Error
// 输出异常内容 // 输出异常内容
Response::send($data, $type, Config::get('response_return')); Response::send($data, $type, Config::get('response_return'));
} else { } else {
ob_end_clean(); //ob_end_clean();
extract($vars); extract($vars);
include Config::get('exception_tmpl'); include Config::get('exception_tmpl');
} }
@@ -195,7 +194,7 @@ class Error
$source = [ $source = [
'first' => $first, 'first' => $first,
'source' => array_slice($contents, $first - 1, 19) 'source' => array_slice($contents, $first - 1, 19),
]; ];
} catch (Exception $e) { } catch (Exception $e) {
$source = []; $source = [];