Merge from 3.0 branch till 898.

1 files changed, 3 insertions, 2 deletions

diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index f5f4b9fa..695d072a 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -627,7 +627,7 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 	}

 

 	/**

-	 * @param string how the list should be displayed, using table or using line breaks (Table, Flow)

+	 * @param string how the list should be displayed, using table or using line breaks (Table, Flow, Raw)

 	 */

 	public function setRepeatLayout($value)

 	{

@@ -825,7 +825,8 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 	public function renderItem($writer,$repeatInfo,$itemType,$index)

 	{

 		$item=$this->getItem($itemType,$index);

-		if($repeatInfo->getRepeatLayout()==='Table')

+		$layout=$repeatInfo->getRepeatLayout();

+		if($layout==='Table' || $layout==='Raw')

 			$item->renderContents($writer);

 		else

 			$item->renderControl($writer);