From 47562d9863c63a70c03fabc17f799fc702472ee3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 25 Dec 2005 03:26:35 +0000
Subject: Fixed HTML encoding problem.

---
 framework/Web/THttpRequest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'framework/Web/THttpRequest.php')

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index d42035df..a6fcdf55 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -335,21 +335,23 @@ class THttpRequest extends TModule
 	 * @param string service ID
 	 * @param string service parameter
 	 * @param array GET parameters, null if not needed
+	 * @param boolean whether to encode the ampersand in URL, defaults to false.
 	 * @return string URL
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null)
+	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false)
 	{
 		$url=$this->getApplicationPath();
 		$url.='?'.$serviceID.'=';
 		if(!empty($serviceParam))
 			$url.=$serviceParam;
+		$amp=$encodeAmpersand?'&amp;':'&';
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
 			foreach($getItems as $name=>$value)
-				$url.='&amp;'.urlencode($name).'='.urlencode($value);
+				$url.=$amp.urlencode($name).'='.urlencode($value);
 		}
 		if(defined('SID') && SID != '')
-			$url.='&amp;'.SID;
+			$url.=$amp.SID;
 		return $url;
 	}
 
-- 
cgit v1.2.3