From d860219f366a8fbe63b03d26c69525d4e6bd4f3a Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Mon, 15 Feb 2010 09:20:35 +0000
Subject: Merge from r2765 (and some others) 3.1 Added TActiveTableRow QST page
 Corrected an uninitialized array in TScaffoldBase

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

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

diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index b8dd666b..a82ee4ec 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -218,9 +218,9 @@ class TInPlaceTextBox extends TActiveTextBox
 		$options['ExternalControl'] = $this->getExternalControlID();
 		$options['AutoHide'] = $this->getAutoHideTextBox() == false ? '' : true;
 		$options['AutoPostBack'] = $this->getAutoPostBack() == false ? '' : true;
+		$options['Columns'] = $this->getColumns();
 		if($this->getTextMode()==='MultiLine')
 		{
-			$options['Columns'] = $this->getColumns();
 			$options['Rows'] = $this->getRows();
 			$options['Wrap'] = $this->getWrap()== false ? '' : true;
 		}
-- 
cgit v1.2.3