Browse Source

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

Matthew Lanigan 14 years ago
parent
commit
0e607bf880
1 changed files with 2 additions and 5 deletions
  1. 2 5
      lib/Cake/Console/Command/AclShell.php

+ 2 - 5
lib/Cake/Console/Command/AclShell.php

@@ -576,12 +576,9 @@ class AclShell extends AppShell {
 		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');
 	}