diff options
| author | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
| commit | d860219f366a8fbe63b03d26c69525d4e6bd4f3a (patch) | |
| tree | 6520a9a0a70a941d122de10d8f5ae9e3883a0ac6 /framework/Web/UI/ActiveControls | |
| parent | 94e94e0a8566f23d16658a04c55b0bbfdd6689aa (diff) | |
Merge from r2765 (and some others) 3.1
Added TActiveTableRow QST page
Corrected an uninitialized array in TScaffoldBase
Diffstat (limited to 'framework/Web/UI/ActiveControls')
| -rw-r--r-- | framework/Web/UI/ActiveControls/TInPlaceTextBox.php | 2 |
1 files changed, 1 insertions, 1 deletions
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;
}
|