adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Always use error layout when rendering error pages."

Browse source 
This reverts commit 3495422ac5.
This commit is contained in:
ADmad 2012-04-06 00:47:50 +05:30
parent 72cb96b727
commit c6ce15720e
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Controller/CakeErrorController.php
View file

@ -56,11 +56,7 @@ class CakeErrorController extends AppController {
$this->constructClasses(); $this->constructClasses();
$this->Components->trigger('initialize', array(&$this)); $this->Components->trigger('initialize', array(&$this));
$this->_set(array( $this->_set(array('cacheAction' => false, 'viewPath' => 'Errors'));
'cacheAction' => false,
'viewPath' => 'Errors',
'layout' => 'error'
));
if (isset($this->RequestHandler)) { if (isset($this->RequestHandler)) {
$this->RequestHandler->startup($this); $this->RequestHandler->startup($this);
} }

1
lib/Cake/Error/ExceptionRenderer.php
View file

@ -150,7 +150,6 @@ class ExceptionRenderer {
$controller = new CakeErrorController($request, $response); $controller = new CakeErrorController($request, $response);
} catch (Exception $e) { } catch (Exception $e) {
$controller = new Controller($request, $response); $controller = new Controller($request, $response);
$controller->layout = 'error';
$controller->viewPath = 'Errors'; $controller->viewPath = 'Errors';
} }
return $controller; return $controller;