mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Simplify logic, test + cert

Browse Source
This commit is contained in:
Sam Georges 2014-06-17 20:11:31 +10:00
parent 4c31211153
commit 041c6e408f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cms/classes/Controller.php
View File

@ -125,11 +125,12 @@ class Controller extends BaseController
/*
* If the page was not found, render the 404 page - either provided by the theme or the built-in one.
*/
if (!$page && ($page = $this->router->findByUrl('/404')))
if (!$page) {
$this->setStatusCode(404);
if (!$page)
return Response::make(View::make('cms::404'), 404);
if (!$page = $this->router->findByUrl('/404'))
return Response::make(View::make('cms::404'), $this->statusCode);
}
$this->page = $page;