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

Revert "Fix missing view variables."

Browse source 
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 7416c530a2.
This commit is contained in:
ADmad 2012-06-11 02:29:00 +05:30
parent fa0d1c7997
commit 9ce216b09d
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -274,11 +274,6 @@ class ExceptionRenderer {
$this->_outputMessageSafe('error500'); $this->_outputMessageSafe('error500');
} }
} catch (Exception $e) { } catch (Exception $e) {
$this->controller->set(array(
'error' => $e,
'name' => $e->getMessage(),
'code' => $e->getCode(),
));
$this->_outputMessageSafe('error500'); $this->_outputMessageSafe('error500');
} }
} }

4
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
View file

@ -669,7 +669,7 @@ class ExceptionRendererTest extends CakeTestCase {
->with('missingHelper') ->with('missingHelper')
->will($this->throwException($exception)); ->will($this->throwException($exception));
$ExceptionRenderer->controller->expects($this->at(5)) $ExceptionRenderer->controller->expects($this->at(4))
->method('render') ->method('render')
->with('error500') ->with('error500')
->will($this->returnValue(true)); ->will($this->returnValue(true));
@ -701,7 +701,7 @@ class ExceptionRendererTest extends CakeTestCase {
->with('error400') ->with('error400')
->will($this->throwException($exception)); ->will($this->throwException($exception));
$ExceptionRenderer->controller->expects($this->at(4)) $ExceptionRenderer->controller->expects($this->at(3))
->method('render') ->method('render')
->with('error500') ->with('error500')
->will($this->returnValue(true)); ->will($this->returnValue(true));