From d269588e78ce0b20e986136a598e548bdfabe3aa Mon Sep 17 00:00:00 2001 From: Ber Clausen Date: Thu, 25 Oct 2012 12:19:53 -0300 Subject: [PATCH] Avoid duplicating RequestHandler component. --- lib/Cake/Controller/CakeErrorController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Controller/CakeErrorController.php b/lib/Cake/Controller/CakeErrorController.php index 5778648818a..3bcbd72cec8 100644 --- a/lib/Cake/Controller/CakeErrorController.php +++ b/lib/Cake/Controller/CakeErrorController.php @@ -50,7 +50,11 @@ class CakeErrorController extends AppController { */ public function __construct($request = null, $response = null) { parent::__construct($request, $response); - if (count(Router::extensions())) { + if ( + count(Router::extensions()) && + !array_key_exists('RequestHandler', $this->components) && + !in_array('RequestHandler', $this->components, true) + ) { $this->components[] = 'RequestHandler'; } $this->constructClasses();