adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 07:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix exceptions being thrown in beforeFilter breaking error pages.

Browse source 
If an exception was raised in the AppController::beforeFilter(),
requests for content-type responses would render as HTML. Extracting the
startupProcess() allows us to keep a reference to the error controller,
which can be used to force startup RequestHandlerComponent if its
enabled.

Fixes #3389
This commit is contained in:
mark_story 2012-11-24 15:38:42 -05:00
parent e04e0a0ec8
commit 3083b01f7d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,8 +66,6 @@ class CakeErrorController extends AppController {
if ($this->Components->enabled('Security')) { if ($this->Components->enabled('Security')) {
$this->Components->disable('Security'); $this->Components->disable('Security');
} }
$this->startupProcess();
$this->_set(array('cacheAction' => false, 'viewPath' => 'Errors')); $this->_set(array('cacheAction' => false, 'viewPath' => 'Errors'));
} }

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

@ -150,7 +150,11 @@ class ExceptionRenderer {
$response = new CakeResponse(array('charset' => Configure::read('App.encoding'))); $response = new CakeResponse(array('charset' => Configure::read('App.encoding')));
try { try {
$controller = new CakeErrorController($request, $response); $controller = new CakeErrorController($request, $response);
$controller->startupProcess();
} catch (Exception $e) { } catch (Exception $e) {
if (!empty($controller) && $controller->Components->enabled('RequestHandler')) {
$controller->RequestHandler->startup($controller);
}
} }
if (empty($controller)) { if (empty($controller)) {
$controller = new Controller($request, $response); $controller = new Controller($request, $response);