From aaea27e8104ffc486d19ed0d9c88405ca1fc32cd Mon Sep 17 00:00:00 2001
From: tof <>
Date: Wed, 14 May 2008 08:07:12 +0000
Subject: Fixed #843

---
 HISTORY                                    |  1 +
 framework/Web/UI/WebControls/TDataList.php | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HISTORY b/HISTORY
index 79e5ecec..b6441fad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.1.3 To Be Released
 ============================
 BUG: Ticket#836 - TRatingList downgrade (Christophe)
+BUG: Ticket#843 - TDataList alternatinItem issue after changes in rev 2227 (Christophe)
 BUG: Ticket#849 - TDatePicker selecting current date problem (Christophe)
 
 Version 3.1.2 April 21, 2008
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index c4da634a..13edb3bd 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -1175,15 +1175,15 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 
 	private function getAlternatingItemDisplay()
 	{
-		if(($classPath=$this->getAlternatingItemRenderer())==='' && ($template=$this->_alternatingItemTemplate)===null)
+		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null)
 			return array($this->getItemRenderer(),$this->_itemTemplate);
 		else
-			return array($classPath,$template);
+			return array($classPath,$this->_alternatingItemTemplate);
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
-		if(($classPath=$this->getSelectedItemRenderer())==='' && ($template=$this->_selectedItemTemplate)===null)
+		if(($classPath=$this->getSelectedItemRenderer())==='' && $this->_selectedItemTemplate===null)
 		{
 			if($itemIndex%2===0)
 				return array($this->getItemRenderer(),$this->_itemTemplate);
@@ -1191,15 +1191,15 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return array($classPath,$template);
+			return array($classPath,$this->_selectedItemTemplate);
 	}
 
 	private function getEditItemDisplay($itemIndex)
 	{
-		if(($classPath=$this->getEditItemRenderer())==='' && ($template=$this->_editItemTemplate)===null)
+		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return array($classPath,$template);
+			return array($classPath,$this->_editItemTemplate);
 	}
 
 	/**
-- 
cgit v1.2.3