From 06fb51f19d1c47d397fd86213d54e8f6ef0c8f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Fri, 28 Jan 2011 02:06:30 -0430
Subject: [PATCH] Added some missing App::uses() calls

---
 lib/Cake/Controller/Component/AclComponent.php                | 4 +---
 lib/Cake/Controller/Component/AuthComponent.php               | 1 +
 lib/Cake/Controller/Component/CookieComponent.php             | 4 +---
 lib/Cake/Controller/Component/EmailComponent.php              | 2 ++
 .../cases/libs/controller/components/request_handler.test.php | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php
index 66c274a30..e8809f864 100644
--- a/lib/Cake/Controller/Component/AclComponent.php
+++ b/lib/Cake/Controller/Component/AclComponent.php
@@ -264,9 +264,7 @@ class DbAcl extends Object implements AclInterface {
  */
 	function __construct() {
 		parent::__construct();
-		if (!class_exists('AclNode')) {
-			require LIBS . 'model' . DS . 'db_acl.php';
-		}
+		App::uses('AclNode', 'Model');
 		$this->Aro = ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
 		$this->Aco = ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco'));
 	}
diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php
index 251a0e1fe..7f1cf6a94 100644
--- a/lib/Cake/Controller/Component/AuthComponent.php
+++ b/lib/Cake/Controller/Component/AuthComponent.php
@@ -19,6 +19,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Component', 'Controller');
 App::uses('Router', 'Routing');
 App::uses('Security', 'Utility');
 App::uses('Debugger', 'Utility');
diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php
index dfe360f2c..9fefdb540 100644
--- a/lib/Cake/Controller/Component/CookieComponent.php
+++ b/lib/Cake/Controller/Component/CookieComponent.php
@@ -17,9 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-/**
- * Load Security class
- */
+App::uses('Component', 'Controller');
 App::uses('Security', 'Utility');
 
 /**
diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php
index d52a82e77..0c5d95358 100755
--- a/lib/Cake/Controller/Component/EmailComponent.php
+++ b/lib/Cake/Controller/Component/EmailComponent.php
@@ -16,6 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.3467
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('Component', 'Controller');
 App::uses('Multibyte', 'I18n');
 
 /**
diff --git a/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php b/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
index 91a39da37..3d0ea9c9b 100644
--- a/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -20,6 +20,7 @@ App::uses('Controller', 'Controller');
 App::uses('RequestHandlerComponent', 'Controller/Component');
 App::uses('CakeRequest', 'Network');
 App::uses('CakeResponse', 'Network');
+App::uses('Router', 'Routing');
 
 /**
  * RequestHandlerTestController class