Permalink
Browse files

Merge pull request #403 from rintaun/patch-2

$action in AclShell::_getParams() should default to '*', not NULL
  • Loading branch information...
2 parents b6040ae + 0e607bf commit 533feea2b13d11cd17b13a7ef3a3f4ded3602313 @markstory markstory committed Jan 13, 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 533feea

Please sign in to comment.