Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
$action in AclShell::_getParams() defaults to '*', not NULL
  • Loading branch information
rintaun committed Jan 12, 2012
1 parent 4d73f4e commit 0e607bf
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions lib/Cake/Console/Command/AclShell.php
Expand Up @@ -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');
}
Expand Down

0 comments on commit 0e607bf

Please sign in to comment.