From dd174b089f6e5bc32fd572e397fd726eca744980 Mon Sep 17 00:00:00 2001
From: "haertl.mike" <>
Date: Tue, 2 Dec 2008 15:19:48 +0000
Subject: Fixed: TUrlMapping encoded extra parameters twice

---
 framework/Web/TUrlMapping.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'framework')

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;
 		}
-- 
cgit v1.2.3