From e002cc7d95942fb8ac7e899e0e7c5f8998b8b6ba Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 13 Apr 2007 16:08:09 +0000
Subject: removed <span> tags when TDataList.RepeatLayout is Raw

---
 HISTORY                                    | 2 +-
 UPGRADE                                    | 6 ++++++
 framework/Web/UI/WebControls/TDataList.php | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index a3c98c3b..a8d7a318 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,6 @@
 Version 3.1.0 RC To be released
 ===============================
-
+CHG: removed <span> tags when TDataList.RepeatLayout is Raw (Qiang)
 
 Version 3.1.0 beta April 9, 2007
 ================================
diff --git a/UPGRADE b/UPGRADE
index f5690835..aae33904 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -9,6 +9,12 @@ 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.1b
+--------------------
+- When TDataList.RepeatLayout is 'Raw', no <span> tags will be generated
+  for header, footer and items. If your existing code rely on the span tags,
+  you may use 'Flow' layout and set RepeatColumns as 1.
+
 Upgrading from v3.1a
 ---------------------
 - The signature of TActiveRecord::finder() is changed. This affects
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index 25b1221f..6cd01008 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -1097,7 +1097,10 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 	{
 		$item=$this->getItem($itemType,$index);
 		$layout=$repeatInfo->getRepeatLayout();
-		$item->renderControl($writer);
+		if($layout===TRepeatLayout::Raw)
+			$item->renderContents($writer);
+		else
+			$item->renderControl($writer);
 	}
 
 	/**
-- 
cgit v1.2.3