From 067ab51fbd9b2f18f63fc80895476e5b0e2f9bfb Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 31 May 2006 03:12:35 +0000
Subject: Merge from 3.0 branch till 1115.

---
 framework/Web/UI/TControl.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'framework/Web')

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 1aabb2a5..10541a37 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -1544,11 +1544,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 							$control->loadStateRecursive($state[$control->_id],$needViewState);
 							unset($state[$control->_id]);
 						}
-						else
-						{
-							$s=array();
-							$control->loadStateRecursive($s,$needViewState);
-						}
 					}
 				}
 			}
@@ -1581,11 +1576,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
-				{
-					$cs=&$control->saveStateRecursive($needViewState);
-					if(!empty($cs))
-						$state[$control->_id]=&$cs;
-				}
+					$state[$control->_id]=&$control->saveStateRecursive($needViewState);
 			}
 		}
 		if($needViewState && !empty($this->_viewState))
-- 
cgit v1.2.3