From e2d5496a5a8b33c950ba49ac18691cde0d51beb4 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Tue, 15 Sep 2009 08:28:02 +0000
Subject: Apply r2703 changes to 3.1 branch

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

diff --git a/HISTORY b/HISTORY
index a541b39b..416f1388 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ Version 3.1.7 To be released
 BUG: Issue#166 - E_NOTICE level error in TDataGatewayCommand (Carl)
 BUG: Issue#157 - Enabled does not work properly on TActiveRadioButton/CheckBoxList controls (Bradley, Carl)
 BUG: Issue#198 - "Undefined variable: tagName" after error in application configuration. (Christophe)
+BUG: Typo in TBoundColumn (Robin)
 
 Version 3.1.6 July 22, 2009
 BUG: Issue#98 - Missing file in quickstart demo (Chrisotphe)
diff --git a/framework/Web/UI/WebControls/TBoundColumn.php b/framework/Web/UI/WebControls/TBoundColumn.php
index 264bbc6c..fdcde9b2 100644
--- a/framework/Web/UI/WebControls/TBoundColumn.php
+++ b/framework/Web/UI/WebControls/TBoundColumn.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
@@ -188,7 +188,7 @@ class TBoundColumn extends TDataGridColumn
 			case TListItemType::EditItem:
 				if(!$this->getReadOnly())
 				{
-					if(($classPath=$this->getItemRenderer())!=='')
+					if(($classPath=$this->getEditItemRenderer())!=='')
 					{
 						$control=Prado::createComponent($classPath);
 						if($control instanceof IItemDataRenderer)
-- 
cgit v1.2.3