AclNode now extends Model, to avoid infinite loop when attaching AclB…

…ehavior to AppModel Conflicts: lib/Cake/Model/AclNode.php lib/Cake/Model/Aco.php lib/Cake/Model/Aro.php
cakephp · Feb 10, 2012 · 2897c72 · 2897c72
1 parent 7e5ef1d
commit 2897c72
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -16,7 +16,6 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('AppModel', 'Model');
 App::uses('AclNode', 'Model');
 
 /**