From e2b765792fd664cc45c2cc9f686f2b4988b80148 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 18 Nov 2006 13:21:32 +0000
Subject: fixed #454. reverted back constructUrl so that ampersand is not
 encoded by default.

---
 HISTORY                                 | 2 +-
 UPGRADE                                 | 1 -
 framework/TApplication.php              | 5 +----
 framework/Web/Services/TPageService.php | 4 ++--
 framework/Web/THttpRequest.php          | 4 ++--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/HISTORY b/HISTORY
index ce3e991b..64bd3e19 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,7 +4,7 @@ BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
 BUG: TTableCell should render &nbsp; only when Text is not set and there's no child (Qiang)
 ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)
-CHG: constructUrl() now encodes & into &amp; by default (Qiang)
+CHG: Ticket#454 - Redundant PHP Version Check
 CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
 
 Version 3.0.5 October 23, 2006
diff --git a/UPGRADE b/UPGRADE
index 2a3344c9..3df993e7 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -15,7 +15,6 @@ for both A and B.
 
 Upgrading from v3.0.5
 ---------------------
-- constructUrl() now encodes & into &amp; by default.
 - TRepeater does not render <span> anymore for empty item template.
 
 Upgrading from v3.0.4
diff --git a/framework/TApplication.php b/framework/TApplication.php
index bf286e2c..4091ceb8 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -1317,10 +1317,7 @@ class TApplicationStatePersister extends TModule implements IStatePersister
 		if($saveFile)
 		{
 			$fileName=$this->getStateFilePath();
-			if(version_compare(phpversion(),'5.1.0','>='))
-				file_put_contents($fileName,$content,LOCK_EX);
-			else
-				file_put_contents($fileName,$content);
+			file_put_contents($fileName,$content,LOCK_EX);
 		}
 	}
 
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 5d9e74fb..98e53156 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -462,11 +462,11 @@ class TPageService extends TService
 	 * Constructs a URL with specified page path and GET parameters.
 	 * @param string page path
 	 * @param array list of GET parameters, null if no GET parameters required
-	 * @param boolean whether to encode the ampersand in URL, defaults to true.
+	 * @param boolean whether to encode the ampersand in URL, defaults to false.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=false,$encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
 	}
diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index 44efb14b..b9d8d1ea 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -483,11 +483,11 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 	 * @param string service parameter
 	 * @param array GET parameters, null if not needed
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
-	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
+	 * @param boolean whether to encode the GET parameters (their names and values), defaults to false.
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false,$encodeGetItems=true)
 	{
 		$url=$serviceID.'='.$serviceParam;
 		$amp=$encodeAmpersand?'&amp;':'&';
-- 
cgit v1.2.3