A cleaner way to check if RequestHandler is loaded

cakephp · Nov 24, 2012 · 9c0939b · 9c0939b
1 parent 3083b01
commit 9c0939b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/Cake/Controller/CakeErrorController.php b/lib/Cake/Controller/CakeErrorController.php
@@ -52,14 +52,12 @@ class CakeErrorController extends AppController {
  */
 	public function __construct($request = null, $response = null) {
 		parent::__construct($request, $response);
-		if (
-			count(Router::extensions()) &&
-			!array_key_exists('RequestHandler', $this->components) &&
-			!in_array('RequestHandler', $this->components, true)
+		$this->constructClasses();
+		if (count(Router::extensions()) &&
+			!$this->Components->attached('RequestHandler')
 		) {
-			$this->components[] = 'RequestHandler';
+			$this->RequestHandler = $this->Components->load('RequestHandler');
 		}
-		$this->constructClasses();
 		if ($this->Components->enabled('Auth')) {
 			$this->Components->disable('Auth');
 		}