diff options
| author | xue <> | 2006-11-18 13:21:32 +0000 |
|---|---|---|
| committer | xue <> | 2006-11-18 13:21:32 +0000 |
| commit | e2b765792fd664cc45c2cc9f686f2b4988b80148 (patch) | |
| tree | 151144cc65286a01cbcf521641c74f12fe6bdbdc /framework/Web | |
| parent | c42521aa777c2fe70624bbfa258fabefc3c98452 (diff) | |
fixed #454. reverted back constructUrl so that ampersand is not encoded by default.
Diffstat (limited to 'framework/Web')
| -rw-r--r-- | framework/Web/Services/TPageService.php | 4 | ||||
| -rw-r--r-- | framework/Web/THttpRequest.php | 4 |
2 files changed, 4 insertions, 4 deletions
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?'&':'&';
|