From 8f929c6ff8db1c8ea63320b32ef8e3723254135e Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Tue, 1 May 2007 02:30:26 +0000
Subject: [PATCH] Fixing paths to correctly load acl models. Updating test for
 acl

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4961 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/behaviors/acl.php                            | 5 +----
 cake/libs/model/ini_acl.php                                  | 4 ++--
 .../libs/controller/components/dbacl/models/aclnode.test.php | 3 ++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 04631f226..6ffcc0cb0 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -60,10 +60,7 @@ class AclBehavior extends ModelBehavior {
 		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
 
 		if (!ClassRegistry::isKeySet($type)) {
-			uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aclnode');
-			uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aco');
-			uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aro');
-			uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'permission');
+			uses('model' . DS . 'db_acl');
 			$object =& new $type();
 		} else {
 			$object =& ClassRegistry::getObject($type);
diff --git a/cake/libs/model/ini_acl.php b/cake/libs/model/ini_acl.php
index 8532b161c..cc128a122 100644
--- a/cake/libs/model/ini_acl.php
+++ b/cake/libs/model/ini_acl.php
@@ -19,7 +19,7 @@
  * @copyright		Copyright 2005-2007, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package			cake
- * @subpackage		cake.cake.libs.controller.componenets.iniacl
+ * @subpackage		cake.cake.libs.model.iniacl
  * @since			CakePHP(tm) v 0.2.9
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -30,7 +30,7 @@
  * In this file you can extend the AclBase.
  *
  * @package		cake
- * @subpackage	cake.cake.libs.controller.componenets.iniacl
+ * @subpackage	cake.cake.libs.model.iniacl
  */
 class INI_ACL extends AclBase{
 /**
diff --git a/cake/tests/cases/libs/controller/components/dbacl/models/aclnode.test.php b/cake/tests/cases/libs/controller/components/dbacl/models/aclnode.test.php
index 2275aa68f..83deb3956 100644
--- a/cake/tests/cases/libs/controller/components/dbacl/models/aclnode.test.php
+++ b/cake/tests/cases/libs/controller/components/dbacl/models/aclnode.test.php
@@ -29,7 +29,8 @@
 	if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 		define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 	}
-	require_once LIBS.'controller'.DS.'components'.DS.'dbacl'.DS.'models'.DS.'aclnode.php';
+	require_once LIBS.'controller'.DS.'components'.DS.'acl.php';
+	require_once LIBS.'model'.DS.'db_acl.php';
 
 	/**
 	 * Short description for class.