merge from 3.0 branch till 1481.

1 files changed, 2 insertions, 2 deletions

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index 90007fa2..44efb14b 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -482,12 +482,12 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 	 * @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.

+	 * @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.

 	 * @return string URL

 	 * @see parseUrl

 	 */

-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false,$encodeGetItems=true)

+	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)

 	{

 		$url=$serviceID.'='.$serviceParam;

 		$amp=$encodeAmpersand?'&':'&';