diff options
| author | xue <> | 2006-06-28 18:23:52 +0000 |
|---|---|---|
| committer | xue <> | 2006-06-28 18:23:52 +0000 |
| commit | 9afa1445890254e867dd172a36f42484aec8916b (patch) | |
| tree | 426e35c0dd556d3bb194a30c2f80564dda55f191 /framework/Web/UI/WebControls/TMultiView.php | |
| parent | aac749d4fbfdf3508d97f7dfe4d7c2c03597edbb (diff) | |
merge from 3.0 branch till 1208.
Diffstat (limited to 'framework/Web/UI/WebControls/TMultiView.php')
| -rw-r--r-- | framework/Web/UI/WebControls/TMultiView.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php index b6001f90..00c0ce93 100644 --- a/framework/Web/UI/WebControls/TMultiView.php +++ b/framework/Web/UI/WebControls/TMultiView.php @@ -144,7 +144,7 @@ class TMultiView extends TControl {
if($view->getActive())
return;
- $triggerEvent=($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+ $triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
foreach($this->getViews() as $v)
{
if($v===$view)
@@ -153,8 +153,7 @@ class TMultiView extends TControl if($triggerEvent)
{
$view->onActivate(null);
- if($triggerViewChangedEvent)
- $this->onActiveViewChanged(null);
+ $this->onActiveViewChanged(null);
}
}
else if($v->getActive())
|