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

404异常跳转URL配置参数 改为 异常模板地址参数 http_exception_template

Browse Source
This commit is contained in:
thinkphp
2016-06-07 12:24:32 +08:00
parent ae2824ced1
commit 7a579ca60e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Response.php
View File

@@ -223,7 +223,7 @@ class Response
public function header($name, $value = null) public function header($name, $value = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->header = $name; $this->header = array_merge($this->header, $name);
} else { } else {
$this->header[$name] = $value; $this->header[$name] = $value;
} }

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

@@ -95,10 +95,10 @@ class Handle
*/ */
protected function renderHttpException(HttpException $e) protected function renderHttpException(HttpException $e)
{ {
$status = $e->getStatusCode(); $status = $e->getStatusCode();
$error = Config::get('http_exception_url'); $template = Config::get('http_exception_template');
if (!APP_DEBUG && !empty($error[$status])) { if (!APP_DEBUG && !empty($template[$status])) {
return Response::create($error[$status], 'redirect')->send(); return Response::create($template[$status], 'view')->vars(['e' => $e])->send();
} else { } else {
return $this->convertExceptionToResponse($e); return $this->convertExceptionToResponse($e);
} }