Fixed: TUrlMapping encoded extra parameters twice

2 files changed, 3 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index 4f62790b..a6f2d070 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ BUG: Issue#59 - TPropertyAccess::has() returns false even if the property of an
 BUG: Issue#61 - TLogRouter throws exception when using external config file (Michael)
 BUG: Issue#62 - Some mistyping: TJavascript or TJavaScript? (Carl)
 BUG: TActiveLinkButton and TActiveRadioButtonList crashes if it's the only active control imported. Added TActiveControlAdapter (Carl)
+BUG: TUrlMapping encoded extra parameters twice (Michael)
 ENH: Issue#36 - Refactored TRatingList/TActiveRatingList, and added some docs (Bradley)
 ENH: Issue#52 - Upgraded to TinyMCE 3.2.1
 ENH: Issue#72 - Add wildcard support to TUrlMapping (friendly-urls) (Michael)
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 338c00f8..83dd99b6 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -301,7 +301,7 @@ class TUrlMapping extends TUrlManager
 	 			$getItems=array();

 			$key=$serviceID.':'.$serviceParam;

 			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-			    $serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
+				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))

 			{

 				foreach($this->_constructRules[$key] as $rule)

@@ -647,10 +647,8 @@ class TUrlMappingPattern extends TComponent
 		// for the GET variables matching the pattern, put them in the URL path

 		foreach($getItems as $key=>$value)

 		{

-			if($encodeGetItems)

-				$value=rawurlencode($value);

 			if($this->_parameters->contains($key) || $key==='*' && $this->getIsWildCardPattern())

-				$replace['{'.$key.'}']=$value;

+				$replace['{'.$key.'}']=$encodeGetItems ? rawurlencode($value) : $value;

 			else

 				$extra[$key]=$value;

 		}