Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

This reverts commit 3495422.
  • Loading branch information...
commit c6ce15720e0dbeba340fefa714821a569531bdb3 1 parent 72cb96b
@ADmad ADmad authored
View
6 lib/Cake/Controller/CakeErrorController.php
@@ -56,11 +56,7 @@ public function __construct($request = null, $response = null) {
$this->constructClasses();
$this->Components->trigger('initialize', array(&$this));
- $this->_set(array(
- 'cacheAction' => false,
- 'viewPath' => 'Errors',
- 'layout' => 'error'
- ));
+ $this->_set(array('cacheAction' => false, 'viewPath' => 'Errors'));
if (isset($this->RequestHandler)) {
$this->RequestHandler->startup($this);
}
View
1  lib/Cake/Error/ExceptionRenderer.php
@@ -150,7 +150,6 @@ protected function _getController($exception) {
$controller = new CakeErrorController($request, $response);
} catch (Exception $e) {
$controller = new Controller($request, $response);
- $controller->layout = 'error';
$controller->viewPath = 'Errors';
}
return $controller;

0 comments on commit c6ce157

Please sign in to comment.
Something went wrong with that request. Please try again.