adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added check if Router::getRequest(false) is returning a CakeRequest or null in ExceptionRenderer::_getController(). Fixes 'call to undefined method here()' when having Exceptions raised without valid request set to the Router in testsuite (i.e. undefined database config 'test'). Fixes #1678 .

Browse source 
Conflicts:

	lib/Cake/Error/ExceptionRenderer.php
This commit is contained in:
mark_story 2011-05-16 21:11:33 -04:00
parent 085c621c0e
commit 2bc58a5abd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,13 +141,17 @@ class ExceptionRenderer {
* *
* @param Exception $exception The exception to get a controller for. * @param Exception $exception The exception to get a controller for.
* @return Controller * @return Controller
* @access protected
*/ */
protected function _getController($exception) { protected function _getController($exception) {
App::uses('CakeErrorController', 'Controller'); App::uses('CakeErrorController', 'Controller');
if (!$request = Router::getRequest(false)) {
$request = new CakeRequest();
}
try { try {
$controller = new CakeErrorController(Router::getRequest(false)); $controller = new CakeErrorController($request);
} catch (Exception $e) { } catch (Exception $e) {
$controller = new Controller(Router::getRequest(false)); $controller = new Controller($request);
$controller->viewPath = 'Errors'; $controller->viewPath = 'Errors';
} }
return $controller; return $controller;