constructUrl() now encodes & into & by default.

TRepeater does not render <span> anymore for empty item template.

6 files changed, 18 insertions, 10 deletions

diff --git a/HISTORY b/HISTORY
index fd93264d..754b1626 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,10 @@
+Version 3.0.6 December 4, 2006
+==============================
+CHG: constructUrl() now encodes & into & by default (Qiang)
+CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
+
 Version 3.0.5 October 23, 2006
-===============================
+==============================
 BUG: Ticket#409 - Multiple page services will mess up page caching (Qiang)
 BUG: Ticket#417 - SelectedIndex in template incorrect caused by bug in TList (Qiang)
 CHG: Ticket#358 - TFileUpload::saveAs() now returns false instead of exception when error (Qiang)
diff --git a/UPGRADE b/UPGRADE
index 060572c2..2a3344c9 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
 

-         Upgrading Instructions for PRADO Framework v3.0.5

+         Upgrading Instructions for PRADO Framework v3.0.6

          =================================================

 

 !!!IMPORTANT!!!

@@ -13,6 +13,11 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions

 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

 ---------------------

 - TFileUpload::saveAs() will return false instead of raising an exception

diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 1c1e711b..3e4694e6 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -68,7 +68,7 @@ class PradoBase
 	 */

 	public static function getVersion()

 	{

-		return '3.0.5';

+		return '3.0.6';

 	}

 

 	/**

diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index ac4787f2..3e33fbb4 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 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 for the page and GET parameters

 	 */

-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=false,$encodeGetItems=true)

+	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$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 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?'&amp;':'&';

diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php
index 357a8730..046e0a88 100644
--- a/framework/Web/UI/WebControls/TRepeater.php
+++ b/framework/Web/UI/WebControls/TRepeater.php
@@ -364,10 +364,8 @@ class TRepeater extends TDataBoundControl implements INamingContainer
 	 */

 	public function render($writer)

 	{

-		if($this->_items && $this->_items->getCount())

+		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate!==null)

 			$this->renderContents($writer);

-		else if($this->_emptyTemplate!==null)

-			parent::render($writer);

 	}

 

 	/**