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
This commit is contained in:
Ceeram 2012-02-10 23:38:40 +01:00
parent 7e5ef1dc0d
commit 2897c72215
3 changed files with 2 additions and 4 deletions

View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('AppModel', 'Model'); App::uses('Model', 'Model');
/** /**
* ACL Node * ACL Node
* *
* @package Cake.Model * @package Cake.Model
*/ */
class AclNode extends AppModel { class AclNode extends Model {
/** /**
* Explicitly disable in-memory query caching for ACL models * Explicitly disable in-memory query caching for ACL models

View file

@ -16,7 +16,6 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('AppModel', 'Model');
App::uses('AclNode', 'Model'); App::uses('AclNode', 'Model');
/** /**

View file

@ -16,7 +16,6 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('AppModel', 'Model');
App::uses('AclNode', 'Model'); App::uses('AclNode', 'Model');
/** /**