mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正路由类

Browse Source
This commit is contained in:
thinkphp
2015-12-12 07:58:58 +08:00
parent b40030abce
commit 28508f690a
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/error.php
View File

@@ -91,20 +91,18 @@ class Error
*
* @param mixed $error 错误
* @param int $code
*
* @internal param int $errno 错误代码
*/
public static function halt($error, $code = 1)
{
$message = is_array($error) ? $error['message'] : $error;
$code = is_array($error) ? $error['code'] : $code;
$e = ['mssage' => $message, 'code' => $code];
if (APP_DEBUG) {
//调试模式下输出错误信息
if (!is_array($error)) {
$trace = debug_backtrace();
$e['message'] = $error;
$e['code'] = $code;
$e['file'] = $trace[0]['file'];
$e['line'] = $trace[0]['line'];
ob_start();
@@ -119,8 +117,11 @@ class Error
if (!empty($error_page)) {
header('Location: ' . $error_page);
} else {
$e['code'] = $code;
$e['message'] = Config::get('show_error_msg') ? $message : Config::get('error_message');
}
} else {
$e = ['mssage' => $message, 'code' => $code];
}
$type = Config::get('default_return_type');