summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2011-06-01 08:35:24 +0000
committerctrlaltca@gmail.com <>2011-06-01 08:35:24 +0000
commit42e6d7ecea063d81e168cdb5009ddc89ea2da3b6 (patch)
tree6bb62c95e339511a5833165955cb0814998acd62 /framework/Web/UI
parente38ecc97ba8c29bf7859021616feee2f4962f404 (diff)
up-ported fix for #311 to trunk/
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/WebControls/TDataList.php2
1 files changed, 1 insertions, 1 deletions
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();