Skip to content
Browse files

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
  • Loading branch information...
1 parent 7e5ef1d commit 2897c7221546012e528da27c92bd889bfd9df727 @ceeram ceeram committed
Showing with 2 additions and 4 deletions.
  1. +2 −2 lib/Cake/Model/AclNode.php
  2. +0 −1 lib/Cake/Model/Aco.php
  3. +0 −1 lib/Cake/Model/Aro.php
View
4 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
View
1 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');
/**
View
1 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');
/**

0 comments on commit 2897c72

Please sign in to comment.
Something went wrong with that request. Please try again.