diff --git a/lib/Cake/Model/Permission.php b/lib/Cake/Model/Permission.php index f03fa30e8..303124b03 100644 --- a/lib/Cake/Model/Permission.php +++ b/lib/Cake/Model/Permission.php @@ -129,7 +129,6 @@ class Permission extends AppModel { $perms = Hash::extract($perms, '{n}.' . $this->alias); foreach ($perms as $perm) { if ($action === '*') { - foreach ($permKeys as $key) { if (!empty($perm)) { if ($perm[$key] == -1) { diff --git a/lib/Cake/Test/Case/Console/Command/AclShellTest.php b/lib/Cake/Test/Case/Console/Command/AclShellTest.php index 1d79c90e5..702b7a57f 100644 --- a/lib/Cake/Test/Case/Console/Command/AclShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/AclShellTest.php @@ -253,7 +253,7 @@ class AclShellTest extends CakeTestCase { $this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create'); $this->Task->check(); - $this->Task->args = array('AuthUser.2', 'ROOT/Controller1', '*'); + $this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'delete'); $this->Task->check(); }