diff options
| author | xue <> | 2006-05-31 03:12:35 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-31 03:12:35 +0000 |
| commit | 067ab51fbd9b2f18f63fc80895476e5b0e2f9bfb (patch) | |
| tree | 4025d5e8379bef9de6bb4d251c2796c00e8503a2 /framework | |
| parent | b87fd00a62994d24a3708cec5f5613ed2e9a67ed (diff) | |
Merge from 3.0 branch till 1115.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Web/UI/TControl.php | 11 |
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))
|