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 php4 issues for AclShell test case.

Browse source
This commit is contained in:
Mark Story 2010-01-14 22:15:06 -05:00
parent adb0c809a0
commit f2cc41bb3a
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/console/libs/acl.php
View file

@ -92,7 +92,7 @@ class AclShell extends Shell {
require_once (CONFIGS.'database.php');
if (!in_array($this->command, array('initdb'))) {
$this->Acl = new AclComponent();
$this->Acl =& new AclComponent();
$controller = null;
$this->Acl->startup($controller);
}
@ -257,9 +257,9 @@ class AclShell extends Shell {
extract($this->__getParams());
if ($this->Acl->check($aro, $aco, $action)) {
$this->out(sprintf(__("%s is allowed.", true), $aro), true);
$this->out(sprintf(__("%s is allowed.", true), $aroName), true);
} else {
$this->out(sprintf(__("%s is not allowed.", true), $aro), true);
$this->out(sprintf(__("%s is not allowed.", true), $aroName), true);
}
}
@ -560,6 +560,8 @@ class AclShell extends Shell {
function __getParams() {
$aro = is_numeric($this->args[0]) ? intval($this->args[0]) : $this->args[0];
$aco = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
$aroName = $aro;
$acoName = $aco;
if (is_string($aro)) {
$aro = $this->parseIdentifier($aro);
@ -574,7 +576,7 @@ class AclShell extends Shell {
$action = '*';
}
}
return compact('aro', 'aco', 'action');
return compact('aro', 'aco', 'action', 'aroName', 'acoName');
}
/**

4
cake/libs/controller/components/acl.php
View file

@ -225,8 +225,8 @@ class DbAcl extends AclBase {
* @access public
*/
function initialize(&$component) {
$component->Aro = $this->Aro;
$component->Aco = $this->Aco;
$component->Aro =& $this->Aro;
$component->Aco =& $this->Aco;
}
/**