Permalink
Browse files

$action in AclShell::_getParams() defaults to '*', not NULL

  • Loading branch information...
1 parent 4d73f4e commit 0e607bf880f27519f4cc6833e09b203821ef3307 @rintaun rintaun committed Jan 12, 2012
Showing with 2 additions and 5 deletions.
  1. +2 −5 lib/Cake/Console/Command/AclShell.php
@@ -576,12 +576,9 @@ protected function _getParams() {
if (is_string($aco)) {
$aco = $this->parseIdentifier($aco);
}
- $action = null;
- if (isset($this->args[2])) {
+ $action = '*';
+ if (isset($this->args[2]) && !in_array($this->args[2], array('', 'all'))) {
$action = $this->args[2];
- if ($action == '' || $action == 'all') {
- $action = '*';
- }
}
return compact('aro', 'aco', 'action', 'aroName', 'acoName');
}

0 comments on commit 0e607bf

Please sign in to comment.