Fix Controller::beforeRedirect() and array return.

Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.

Fixes #2973

lib/Cake/Controller/Controller.php

@@ -797,7 +797,7 @@ class Controller extends Object implements CakeEventListener {
  * @return array Array with keys url, status and exit
  */
 	protected function _parseBeforeRedirect($response, $url, $status, $exit) {
-		if (is_array($response)) {
+		if (is_array($response) && isset($response[0])) {
 			foreach ($response as $resp) {
 				if (is_array($resp) && isset($resp['url'])) {
 					extract($resp, EXTR_OVERWRITE);
@@ -805,6 +805,8 @@ class Controller extends Object implements CakeEventListener {
 					$url = $resp;
 				}
 			}
+		} elseif (is_array($response)) {
+			extract($response, EXTR_OVERWRITE);
 		}
 		return compact('url', 'status', 'exit');
 	}

lib/Cake/Test/Case/Controller/ControllerTest.php

@@ -874,6 +874,33 @@ class ControllerTest extends CakeTestCase {
 		$Controller->redirect('http://cakephp.org');
 	}
 
+/**
+ * Test that beforeRedirect works with returning an array from the controller method.
+ *
+ * @return void
+ */
+	public function testRedirectBeforeRedirectInControllerWithArray() {
+		$Controller = $this->getMock('Controller', array('_stop', 'beforeRedirect'));
+		$Controller->response = $this->getMock('CakeResponse', array('header'));
+		$Controller->Components = $this->getMock('ComponentCollection', array('trigger'));
+
+		$Controller->expects($this->once())
+			->method('beforeRedirect')
+			->with('http://cakephp.org', null, true)
+			->will($this->returnValue(array(
+				'url' => 'http://example.org',
+				'status' => 302,
+				'exit' => true
+			)));
+
+		$Controller->response->expects($this->at(0))
+			->method('header')
+			->with('Location', 'http://example.org');
+
+		$Controller->expects($this->once())->method('_stop');
+		$Controller->redirect('http://cakephp.org');
+	}
+
 /**
  * testMergeVars method
  *