Add comments for possibly confusing code.

cakephp · Dec 14, 2014 · f19916b · f19916b
1 parent c58e7da
commit f19916b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php
@@ -157,7 +157,13 @@ protected function _getController($exception) {
 			} 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) {