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

This reverts commit 3495422.
cakephp · Apr 5, 2012 · c6ce157 · c6ce157
1 parent 72cb96b
commit c6ce157
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/lib/Cake/Controller/CakeErrorController.php b/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);
 		}

diff --git a/lib/Cake/Error/ExceptionRenderer.php b/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;