Removing extra 0 index in request parameters.

When using requestAction with the return parameter, there
would be an extra 0 index element that would create incorrect
routes in the requestedAction.
Fixes #2067

lib/Cake/Core/Object.php

@@ -65,8 +65,10 @@ public function requestAction($url, $extra = array()) {
 			return false;
 		}
 		App::uses('Dispatcher', 'Routing');
-		if (in_array('return', $extra, true)) {
-			$extra = array_merge($extra, array('return' => 0, 'autoRender' => 1));
+		if (($index = array_search('return', $extra)) !== false) {
+			$extra['return'] = 0;
+			$extra['autoRender'] = 1;
+			unset($extra[$index]);
 		}
 		if (is_array($url) && !isset($extra['url'])) {
 			$extra['url'] = array();

lib/Cake/Test/Case/Core/ObjectTest.php

@@ -124,7 +124,16 @@ public function post_pass() {
  * @return array
  */
 	public function params_pass() {
-		return $this->params;
+		return $this->request;
+	}
+
+	public function param_check() {
+		$this->autoRender = false;
+		$content = '';
+		if (isset($this->request->params[0])) {
+			$content = 'return found';
+		}
+		$this->response->body($content);
 	}
 }
 
@@ -564,6 +573,18 @@ public function testRequestActionArray() {
 		$this->assertTrue($result);
 	}
 
+/**
+ * Test that requestAction() does not forward the 0 => return value.
+ *
+ * @return void
+ */
+	public function testRequestActionRemoveReturnParam() {
+		$result = $this->object->requestAction(
+			'/request_action/param_check', array('return')
+		);
+		$this->assertEquals('', $result, 'Return key was found');
+	}
+
 /**
  * Test that requestAction() is populating $this->params properly
  *
@@ -615,13 +636,4 @@ public function testRequestActionPostPassing() {
 
 		$_POST = $_tmp;
 	}
-
-/**
- * testCakeError
- *
- * @return void
- */
-	public function testCakeError() {
-
-	}
 }