From 3850edb7440923c6296026c658d53f44faceff55 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 4 Nov 2006 03:33:00 +0000
Subject: merge from 3.0 branch till 1489.

---
 framework/Web/UI/WebControls/TTableCell.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/WebControls/TTableCell.php')

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