Skip to content
This repository
Browse code

Minor refactor of variable names.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8215 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
commit f79a68b2a60bdec3e86c17b1c8f769bcc1a5b843 1 parent 8971aad
Mark Story authored

Showing 1 changed file with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. 8  cake/libs/controller/components/auth.php
8  cake/libs/controller/components/auth.php
@@ -263,8 +263,8 @@ function initialize(&$controller) {
263 263
  */
264 264
 	function startup(&$controller) {
265 265
 		$methods = array_flip($controller->methods);
266  
-		$controllerAction = strtolower($controller->params['action']);
267  
-		$lowerAllowedActions = array_map('strtolower', $this->allowedActions);
  266
+		$action = strtolower($controller->params['action']);
  267
+		$allowedActions = array_map('strtolower', $this->allowedActions);
268 268
 
269 269
 		$isErrorOrTests = (
270 270
 			strtolower($controller->name) == 'cakeerror' ||
@@ -276,7 +276,7 @@ function startup(&$controller) {
276 276
 
277 277
 		$isMissingAction = (
278 278
 			$controller->scaffold === false &&
279  
-			!isset($methods[$controllerAction])
  279
+			!isset($methods[$action])
280 280
 		);
281 281
 
282 282
 		if ($isMissingAction) {
@@ -298,7 +298,7 @@ function startup(&$controller) {
298 298
 
299 299
 		$isAllowed = (
300 300
 			$this->allowedActions == array('*') ||
301  
-			in_array($controllerAction, $lowerAllowedActions)
  301
+			in_array($action, $allowedActions)
302 302
 		);
303 303
 
304 304
 		if ($loginAction != $url && $isAllowed) {

0 notes on commit f79a68b

Please sign in to comment.
Something went wrong with that request. Please try again.