From 2897c7221546012e528da27c92bd889bfd9df727 Mon Sep 17 00:00:00 2001
From: Ceeram <c33ram@gmail.com>
Date: Fri, 10 Feb 2012 23:38:40 +0100
Subject: [PATCH] AclNode now extends Model, to avoid infinite loop when
 attaching AclBehavior to AppModel

Conflicts:

	lib/Cake/Model/AclNode.php
	lib/Cake/Model/Aco.php
	lib/Cake/Model/Aro.php
---
 lib/Cake/Model/AclNode.php | 4 ++--
 lib/Cake/Model/Aco.php     | 1 -
 lib/Cake/Model/Aro.php     | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php
index 8c51e6ba0..2cd40c779 100644
--- a/lib/Cake/Model/AclNode.php
+++ b/lib/Cake/Model/AclNode.php
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('AppModel', 'Model');
+App::uses('Model', 'Model');
 
 /**
  * ACL Node
  *
  * @package       Cake.Model
  */
-class AclNode extends AppModel {
+class AclNode extends Model {
 
 /**
  * Explicitly disable in-memory query caching for ACL models
diff --git a/lib/Cake/Model/Aco.php b/lib/Cake/Model/Aco.php
index d1beedf50..1f432a833 100644
--- a/lib/Cake/Model/Aco.php
+++ b/lib/Cake/Model/Aco.php
@@ -16,7 +16,6 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('AppModel', 'Model');
 App::uses('AclNode', 'Model');
 
 /**
diff --git a/lib/Cake/Model/Aro.php b/lib/Cake/Model/Aro.php
index def6ec3da..a63877786 100644
--- a/lib/Cake/Model/Aro.php
+++ b/lib/Cake/Model/Aro.php
@@ -16,7 +16,6 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('AppModel', 'Model');
 App::uses('AclNode', 'Model');
 
 /**