Browse Source

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.
mark_story 14 years ago
parent
commit
32b48ecc7c
2 changed files with 6 additions and 2 deletions
  1. 5 1
      lib/Cake/Network/CakeRequest.php
  2. 1 1
      lib/Cake/Routing/Dispatcher.php

+ 5 - 1
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.

+ 1 - 1
lib/Cake/Routing/Dispatcher.php

@@ -75,8 +75,8 @@ class Dispatcher {
 			return;
 		}
 
-		$request = $this->parseParams($request, $additionalParams);
 		Router::setRequestInfo($request);
+		$request = $this->parseParams($request, $additionalParams);
 		$controller = $this->_getController($request, $response);
 
 		if (!($controller instanceof Controller)) {