wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of $this->template logic, switched to type of exception

Browse Source
This commit is contained in:
Anton Terekhov
2012-12-11 18:56:07 +04:00
parent fce43da00d
commit a2cb6a405e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/ErrorAction.php
View File

@ -25,11 +25,12 @@ class ErrorAction extends Action
protected function execute() protected function execute()
{ {
$this->template = 500;
if ($this->exception instanceof Error404Exception) { if ($this->exception instanceof Error404Exception) {
$this->template = 404; $this->template = 404;
} elseif ($this->exception instanceof ErrorHTTPException) { } elseif ($this->exception instanceof ErrorHTTPException) {
$this->template = 'HTTP'; $this->template = 'HTTP';
} else {
$this->template = 500;
} }
$this->logError(); $this->logError();
$this->sendHTTPCode(); $this->sendHTTPCode();
@ -50,19 +51,16 @@ class ErrorAction extends Action
protected function sendHttpCode() protected function sendHttpCode()
{ {
switch ($this->template) { if ($this->exception instanceof ErrorHTTPException) {
case 404: header($this->exception->getHTTPHeader());
case 'HTTP': } else {
header($this->exception->getHTTPHeader()); header('HTTP/1.0 500 Internal Server Error');
break;
default:
header('HTTP/1.0 500 Internal Server Error');
} }
} }
protected function logError() protected function logError()
{ {
if ($this->template == 500) { if (!$this->exception instanceof Error404Exception) {
ErrorHandler::logError($this->exception); ErrorHandler::logError($this->exception);
} }
} }