adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing paths to correctly load acl models.

Browse source 
Updating test for acl

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4961 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-05-01 02:30:26 +00:00
parent 166132ca10
commit 8f929c6ff8
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/model/behaviors/acl.php
View file

@ -60,10 +60,7 @@ class AclBehavior extends ModelBehavior {
$type = $this->__typeMaps[$this->settings[$model->name]['type']]; $type = $this->__typeMaps[$this->settings[$model->name]['type']];
if (!ClassRegistry::isKeySet($type)) { if (!ClassRegistry::isKeySet($type)) {
uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aclnode'); uses('model' . DS . 'db_acl');
uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aco');
uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'aro');
uses('controller' . DS . 'components' . DS . 'dbacl' . DS . 'models' . DS . 'permission');
$object =& new $type(); $object =& new $type();
} else { } else {
$object =& ClassRegistry::getObject($type); $object =& ClassRegistry::getObject($type);

4
cake/libs/model/ini_acl.php
View file

@ -19,7 +19,7 @@
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc. * @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.componenets.iniacl * @subpackage cake.cake.libs.model.iniacl
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -30,7 +30,7 @@
* In this file you can extend the AclBase. * In this file you can extend the AclBase.
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.componenets.iniacl * @subpackage cake.cake.libs.model.iniacl
*/ */
class INI_ACL extends AclBase{ class INI_ACL extends AclBase{
/** /**

3
cake/tests/cases/libs/controller/components/dbacl/models/aclnode.test.php
View file

@ -29,7 +29,8 @@
if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
define('CAKEPHP_UNIT_TEST_EXECUTION', 1); define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
} }
require_once LIBS.'controller'.DS.'components'.DS.'dbacl'.DS.'models'.DS.'aclnode.php'; require_once LIBS.'controller'.DS.'components'.DS.'acl.php';
require_once LIBS.'model'.DS.'db_acl.php';
/** /**
* Short description for class. * Short description for class.