From 42e6d7ecea063d81e168cdb5009ddc89ea2da3b6 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Wed, 1 Jun 2011 08:35:24 +0000
Subject: up-ported fix for #311 to trunk/

---
 framework/Web/UI/WebControls/TDataList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Web/UI/WebControls')

diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index 986d56e5..0bbfc9ac 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -1321,7 +1321,7 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 		if($this->_footer!==null && $this->_footer instanceof IStyleable)
 		{
 			if($footerStyle=$this->getViewState('FooterStyle',null))
-				$this->_footer->getStyle()->mergeWith($headerStyle);
+				$this->_footer->getStyle()->mergeWith($footerStyle);
 		}
 
 		$selectedIndex=$this->getSelectedItemIndex();
-- 
cgit v1.2.3