Permalink
Browse files

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...
1 parent 8971aad commit f79a68b2a60bdec3e86c17b1c8f769bcc1a5b843 @markstory markstory committed Jul 3, 2009
Showing with 4 additions and 4 deletions.
  1. +4 −4 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) {

0 comments on commit f79a68b

Please sign in to comment.