From b067d9a3a809fab01ea9ad8127b667f17a551353 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Thu, 14 Jan 2010 13:12:27 +0000
Subject: Fixed Issue#94

---
 HISTORY                                          | 1 +
 framework/Web/UI/WebControls/TDataGridColumn.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index e602d3b7..d4bb1e9e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 Version 3.1.7 To be released
 BUG: Issue#80  - Inconsistencies in TRegularExpressionValidator (Christophe)
 BUG: Issue#86  - THttpSession.CookieMode ignored / Session ID leak (Christophe)
+BUG: Issue#94  - DataGrid header/footer renderers unable to locate their parent grid in setData() method (Christophe)
 BUG: Issue#151 - TTextBox fails to display inital line break (Yves)
 BUG: Issue#153 - Bug with calls like MyActiveRedorc->withText()->withUser()->find(...) and null result (Christophe)
 BUG: Issue#157 - Enabled does not work properly on TActiveRadioButton/CheckBoxList controls (Bradley, Carl)
diff --git a/framework/Web/UI/WebControls/TDataGridColumn.php b/framework/Web/UI/WebControls/TDataGridColumn.php
index 577c0068..ed53dc88 100644
--- a/framework/Web/UI/WebControls/TDataGridColumn.php
+++ b/framework/Web/UI/WebControls/TDataGridColumn.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
@@ -418,6 +418,7 @@ abstract class TDataGridColumn extends TApplicationComponent
 		if(($classPath=$this->getHeaderRenderer())!=='')
 		{
 			$control=Prado::createComponent($classPath);
+			$cell->getControls()->add($control);
 			if($control instanceof IDataRenderer)
 			{
 				if($control instanceof IItemDataRenderer)
@@ -428,7 +429,6 @@ abstract class TDataGridColumn extends TApplicationComponent
 				}
 				$control->setData($text);
 			}
-			$cell->getControls()->add($control);
 		}
 		else if($this->getAllowSorting())
 		{
@@ -489,6 +489,7 @@ abstract class TDataGridColumn extends TApplicationComponent
 		if(($classPath=$this->getFooterRenderer())!=='')
 		{
 			$control=Prado::createComponent($classPath);
+			$cell->getControls()->add($control);
 			if($control instanceof IDataRenderer)
 			{
 				if($control instanceof IItemDataRenderer)
@@ -499,7 +500,6 @@ abstract class TDataGridColumn extends TApplicationComponent
 				}
 				$control->setData($text);
 			}
-			$cell->getControls()->add($control);
 		}
 		else if($text!=='')
 			$cell->setText($text);
-- 
cgit v1.2.3