Skip to content

Commit

Permalink
Revert "Fix missing view variables."
Browse files Browse the repository at this point in the history
Commit 7416c53 shows error message from last exception instead of first one
and also displays framework specific error messages instead of generic ones with debug off.
We don't want either.

This reverts commit 7416c53.
  • Loading branch information
ADmad committed Jun 10, 2012
1 parent fa0d1c7 commit 9ce216b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
5 changes: 0 additions & 5 deletions lib/Cake/Error/ExceptionRenderer.php
Expand Up @@ -274,11 +274,6 @@ protected function _outputMessage($template) {
$this->_outputMessageSafe('error500');
}
} catch (Exception $e) {
$this->controller->set(array(
'error' => $e,
'name' => $e->getMessage(),
'code' => $e->getCode(),
));
$this->_outputMessageSafe('error500');
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Error/ExceptionRendererTest.php
Expand Up @@ -669,7 +669,7 @@ public function testMissingRenderSafe() {
->with('missingHelper')
->will($this->throwException($exception));

$ExceptionRenderer->controller->expects($this->at(5))
$ExceptionRenderer->controller->expects($this->at(4))
->method('render')
->with('error500')
->will($this->returnValue(true));
Expand Down Expand Up @@ -701,7 +701,7 @@ public function testMissingSubdirRenderSafe() {
->with('error400')
->will($this->throwException($exception));

$ExceptionRenderer->controller->expects($this->at(4))
$ExceptionRenderer->controller->expects($this->at(3))
->method('render')
->with('error500')
->will($this->returnValue(true));
Expand Down

0 comments on commit 9ce216b

Please sign in to comment.