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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-05-18 15:20:18 +08:00
parent 2dab11d3c4 0e441d2b69
commit e3f162f310
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,13 +42,13 @@ class Handle
'message' => $exception->getMessage(), 'message' => $exception->getMessage(),
'code' => $this->getCode($exception), 'code' => $this->getCode($exception),
]; ];
$log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]"; $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
} else { } else {
$data = [ $data = [
'code' => $exception->getCode(), 'code' => $exception->getCode(),
'message' => $exception->getMessage(), 'message' => $exception->getMessage(),
]; ];
$log = "[{$data['code']}]{$data['message']}"; $log = "[{$data['code']}]{$data['message']}";
} }
Log::record($log, 'error'); Log::record($log, 'error');
@@ -144,6 +144,10 @@ class Handle
// 不显示详细错误信息 // 不显示详细错误信息
$data['message'] = Config::get('error_message'); $data['message'] = Config::get('error_message');
} }
//保留一层
while (ob_get_level() > 1) {
ob_end_clean();
}
ob_start(); ob_start();
ob_implicit_flush(0); ob_implicit_flush(0);
extract($data); extract($data);