Merge from 3.0 branch till 1115.

1 files changed, 1 insertions, 10 deletions

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))