From d8556e05806edf2ae978921ae97fabc916e49df6 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 3 Nov 2006 13:22:08 +0000
Subject: TTableCell should render &nbsp; when no text is set and there is no
 child control.

---
 framework/Web/UI/WebControls/TDataGridColumn.php | 5 ++---
 framework/Web/UI/WebControls/TTableCell.php      | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'framework')

diff --git a/framework/Web/UI/WebControls/TDataGridColumn.php b/framework/Web/UI/WebControls/TDataGridColumn.php
index 30349244..f0d088d2 100644
--- a/framework/Web/UI/WebControls/TDataGridColumn.php
+++ b/framework/Web/UI/WebControls/TDataGridColumn.php
@@ -346,9 +346,8 @@ abstract class TDataGridColumn extends TApplicationComponent
 				}
 				break;
 			case TDataGrid::IT_FOOTER:
-				if(($text=$this->getFooterText())==='')
-					$text='&nbsp;';
-				$cell->setText($text);
+				if(($text=$this->getFooterText())!=='')
+					$cell->setText($text);
 				break;
 		}
 	}
diff --git a/framework/Web/UI/WebControls/TTableCell.php b/framework/Web/UI/WebControls/TTableCell.php
index 8b80e1f2..dad2e69b 100644
--- a/framework/Web/UI/WebControls/TTableCell.php
+++ b/framework/Web/UI/WebControls/TTableCell.php
@@ -185,10 +185,12 @@ class TTableCell extends TWebControl
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())==='')
+		if(($text=$this->getText())!=='')
+			$writer->write($text);
+		else if($this->getHasControls())
 			parent::renderContents($writer);
 		else
-			$writer->write($text);
+			$writer->write('&nbsp;');
 	}
 }
 
-- 
cgit v1.2.3