From 716b5cd6c55019fd7ce6a0ce9026420f3e45525e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Oct 2010 02:53:31 +0000 Subject: [PATCH] BUGFIX: reverted revision 105890 to fix build (from r105903) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112509 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Director.php | 1 + core/control/RequestHandler.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/control/Director.php b/core/control/Director.php index 82ebc8a0e..42cb83905 100755 --- a/core/control/Director.php +++ b/core/control/Director.php @@ -275,6 +275,7 @@ class Director { return "redirect:" . Director::absoluteURL($arguments['Redirect'], true); } else { + Director::$urlParams = $arguments; $controllerObj = new $controller(); $controllerObj->setSession($session); diff --git a/core/control/RequestHandler.php b/core/control/RequestHandler.php index 27c56e0c6..e2728a939 100755 --- a/core/control/RequestHandler.php +++ b/core/control/RequestHandler.php @@ -116,7 +116,7 @@ class RequestHandler extends ViewableData { if($this instanceof Controller) $this->urlParams = $request->allParams(); // Backwards compatible setting of url parameters, please use SS_HTTPRequest->latestParam() instead - Director::setUrlParams($request->latestParams()); + //Director::setUrlParams($request->latestParams()); if(isset($_REQUEST['debug_request'])) { Debug::message("Rule '$rule' matched to action '$action' on $this->class. Latest request params: " . var_export($request->latestParams(), true));