Fix issue with missing base on redirect route.

The request data wasn't set in Router when redirect routes are processed. This caused the base to become missing. This causes issues with applications running in a subdirectory.
cakephp · Oct 22, 2011 · 32b48ec · 32b48ec
1 parent 841e7aa
commit 32b48ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
@@ -34,7 +34,11 @@ class CakeRequest implements ArrayAccess {
  *
  * @var array
  */
-	public $params = array();
+	public $params = array(
+		'plugin' => null,
+		'controller' => null,
+		'action' => null,
+	);
 
 /**
  * Array of POST data.  Will contain form data as well as uploaded files.

diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -75,8 +75,8 @@ public function dispatch(CakeRequest $request, CakeResponse $response, $addition
 			return;
 		}
 
-		$request = $this->parseParams($request, $additionalParams);
 		Router::setRequestInfo($request);
+		$request = $this->parseParams($request, $additionalParams);
 		$controller = $this->_getController($request, $response);
 
 		if (!($controller instanceof Controller)) {