mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
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:
parent
7e5ef1dc0d
commit
2897c72215
3 changed files with 2 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
*/
|
||||
|
||||
App::uses('AppModel', 'Model');
|
||||
App::uses('AclNode', 'Model');
|
||||
|
||||
/**
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
*/
|
||||
|
||||
App::uses('AppModel', 'Model');
|
||||
App::uses('AclNode', 'Model');
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue