Fixing parameter ordering error of array_map in AuthComponent::allow(…

…). Adding test.
cakephp · Sep 21, 2009 · 2b0d137 · 2b0d137
1 parent 42017e9
commit 2b0d137
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
@@ -600,7 +600,7 @@ function allow() {
 			if (isset($args[0]) && is_array($args[0])) {
 				$args = $args[0];
 			}
-			$this->allowedActions = array_merge($this->allowedActions, array_map($args, 'strtolower'));
+			$this->allowedActions = array_merge($this->allowedActions, array_map('strtolower', $args));
 		}
 	}
 

diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -844,7 +844,7 @@ function testActionMethod() {
 
 		$result = $this->Controller->Auth->action(':controller');
 		$this->assertEqual($result, 'ROOT/AuthTest');
-		
+
 		$this->Controller->params['plugin'] = 'test_plugin';
 		$this->Controller->params['controller'] = 'auth_test';
 		$this->Controller->params['action'] = 'add';
@@ -899,6 +899,17 @@ function testAllowedActionsWithCamelCaseMethods() {
 		$this->Controller->Auth->allowedActions = array('delete', 'add');
 		$result = $this->Controller->Auth->startup($this->Controller);
 		$this->assertFalse($result, 'startup() should return false, as action is not allowed. %s');
+
+	}
+
+	function testAllowedActionsSetWithAllowMethod() {
+		$url = '/auth_test/action_name';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->allow('action_name', 'anotherAction');
+		$this->assertEqual($this->Controller->Auth->allowedActions, array('action_name', 'anotheraction'));
+
 	}
 
 /**