summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2011-06-01 08:32:47 +0000
committerctrlaltca@gmail.com <>2011-06-01 08:32:47 +0000
commit3abc397e9b53623dd373746e8ab9bd5dd455cd0c (patch)
treebf2dd605a14ac63e9d9c20c283ae0878e2616eea /framework/Web
parent87eb3b2a773c74b0c798ee6c3ecebeb972e88c71 (diff)
fix for #311; updated docs
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/UI/WebControls/TDataList.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index ca628b21..bea74e82 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -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();