Minor refactor of variable names.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8215 3807eeeb-6ff5-0310-8944-8be069107fe0
cakephp · Jul 3, 2009 · f79a68b · f79a68b
1 parent 8971aad
commit f79a68b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
@@ -263,8 +263,8 @@ function initialize(&$controller) {
  */
 	function startup(&$controller) {
 		$methods = array_flip($controller->methods);
-		$controllerAction = strtolower($controller->params['action']);
-		$lowerAllowedActions = array_map('strtolower', $this->allowedActions);
+		$action = strtolower($controller->params['action']);
+		$allowedActions = array_map('strtolower', $this->allowedActions);
 
 		$isErrorOrTests = (
 			strtolower($controller->name) == 'cakeerror' ||
@@ -276,7 +276,7 @@ function startup(&$controller) {
 
 		$isMissingAction = (
 			$controller->scaffold === false &&
-			!isset($methods[$controllerAction])
+			!isset($methods[$action])
 		);
 
 		if ($isMissingAction) {
@@ -298,7 +298,7 @@ function startup(&$controller) {
 
 		$isAllowed = (
 			$this->allowedActions == array('*') ||
-			in_array($controllerAction, $lowerAllowedActions)
+			in_array($action, $allowedActions)
 		);
 
 		if ($loginAction != $url && $isAllowed) {