Skip to content
Browse files

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.
  • Loading branch information...
1 parent 841e7aa commit 32b48ecc7cc8fcf17ccf0d3ceaf9285338336208 @markstory markstory committed
Showing with 6 additions and 2 deletions.
  1. +5 −1 lib/Cake/Network/CakeRequest.php
  2. +1 −1 lib/Cake/Routing/Dispatcher.php
View
6 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.
View
2 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)) {

0 comments on commit 32b48ec

Please sign in to comment.
Something went wrong with that request. Please try again.