fixed #454. reverted back constructUrl so that ampersand is not encoded by default.

3 files changed, 5 insertions, 8 deletions

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?'&':'&';