From f19916bccf627535e77e496c95fd4e0e20e8ea46 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 13 Dec 2014 22:25:52 -0500 Subject: [PATCH] Add comments for possibly confusing code. --- lib/Cake/Error/ExceptionRenderer.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php index 0a8490208..ad36fea3e 100644 --- a/lib/Cake/Error/ExceptionRenderer.php +++ b/lib/Cake/Error/ExceptionRenderer.php @@ -157,7 +157,13 @@ class ExceptionRenderer { } catch (Exception $e) { $startup = false; } - if ($startup === false && !empty($controller) && $controller->Components->enabled('RequestHandler')) { + // Retry RequestHandler, as another aspect of startupProcess() + // could have failed. Ignore any exceptions out of startup, as + // there could be userland input data parsers. + if ($startup === false && + !empty($controller) && + $controller->Components->enabled('RequestHandler') + ) { try { $controller->RequestHandler->startup($controller); } catch (Exception $e) {