Fixed #653.

2 files changed, 2 insertions, 14 deletions

diff --git a/HISTORY b/HISTORY
index bc61deef..ad24ad3c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,7 @@ BUG: Ticket#627 - Logout did not set correct status to the user object (Qiang)
 BUG: Ticket#650 - Fixed TMysqlMetaData bug about SHOW FULL TABLES (Qiang)
 BUG: Ticket#651 - TUserManager Roles names (from config) should be trimmed (Qiang)
 BUG: Ticket#652 - OFFSET must be specified together with LIMIT for TScaffoldView (Qiang)
+BUG: Ticket#653 - TUrlMapping: ServiceId irgnored in URL-Map (Qiang)
 BUG: TWizard Sidebar using TDataListItemRenderer has error (Qiang)
 BUG: Ticket#654 - TAssetManager::copyDirectory() do not run closedir on an invalid resource (Knut)
 BUG: Ticket#655 - TAssetManager::publishTarFile() exception for 'assetmanager_tarchecksum_invalid' is not thrown on BSD systems (Knut)
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 5c04ea8e..82f49877 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -163,11 +163,11 @@ class TUrlMapping extends TUrlManager
 			if(count($matches) > 0)

 			{

 				$this->_matched=$pattern;

-				$this->changeServiceParameters($pattern);

 				$params=array();

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

 					if(is_string($key))

 						$params[$key]=$value;

+				$params[$pattern->getServiceID()]=$pattern->getServiceParameter();

 				return $params;

 			}

 		}

@@ -181,19 +181,6 @@ class TUrlMapping extends TUrlManager
 	{

 		return $this->_matched;

 	}

-

-	/**

-	 * @param TUrlMappingPattern change the Request service ID and page class.

-	 */

-	protected function changeServiceParameters($pattern)

-	{

-		$request = $this->getRequest();

-		$id = $pattern->getServiceID();

-		$param = $pattern->getServiceParameter();

-		$request->setServiceID($id);

-		$request->setServiceParameter($param);

-		$request->add($id,$param);

-	}

 }

 

 /**