From b87fd00a62994d24a3708cec5f5613ed2e9a67ed Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 30 May 2006 21:26:29 +0000
Subject: merge from 3.0 branch till 1111.

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

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

diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 6ff6faba..82c243ca 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -1523,7 +1523,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	protected function renderTable($writer)
 	{
 		$this->renderBeginTag($writer);
-		if($this->_header->getVisible())
+		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
 			$writer->renderBeginTag('thead');
@@ -1536,7 +1536,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 			$item->renderControl($writer);
 		$writer->renderEndTag();
 
-		if($this->_footer->getVisible())
+		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
 			$writer->renderBeginTag('tfoot');
-- 
cgit v1.2.3