summaryrefslogtreecommitdiff
path: root/framework/Web/UI/WebControls
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-03-26 19:28:20 +0100
committerDavid <ottodavid@gmx.net>2014-08-21 17:32:15 +0200
commitc382794ff0e7575ae31cc549789a84d75e6f9a57 (patch)
treeaec4e0677640e6b74a2ee7620560f8b74649c882 /framework/Web/UI/WebControls
parent94e34ad61868dc6a28de6f1a708d63ae0b6b4cf9 (diff)
Fix #506
(cherry picked from commit eaaa9da0c4912f782c3a1043b710ac1b598a41a5)
Diffstat (limited to 'framework/Web/UI/WebControls')
-rw-r--r--framework/Web/UI/WebControls/TLiteralColumn.php17
1 files changed, 6 insertions, 11 deletions
diff --git a/framework/Web/UI/WebControls/TLiteralColumn.php b/framework/Web/UI/WebControls/TLiteralColumn.php
index 973ab801..4b2c39fc 100644
--- a/framework/Web/UI/WebControls/TLiteralColumn.php
+++ b/framework/Web/UI/WebControls/TLiteralColumn.php
@@ -109,18 +109,13 @@ class TLiteralColumn extends TDataGridColumn
if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::EditItem || $itemType===TListItemType::SelectedItem)
{
if($this->getDataField()!=='')
- $cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
- else
{
- if(($dataField=$this->getDataField())!=='')
- $control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
- else
- {
- $text=$this->getText();
- if($this->getEncode())
- $text=THttpUtility::htmlEncode($text);
- $cell->setText($text);
- }
+ $cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+ } else {
+ $text=$this->getText();
+ if($this->getEncode())
+ $text=THttpUtility::htmlEncode($text);
+ $cell->setText($text);
}
}
else