From 9afa1445890254e867dd172a36f42484aec8916b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 28 Jun 2006 18:23:52 +0000
Subject: merge from 3.0 branch till 1208.

---
 framework/Web/UI/WebControls/TMultiView.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

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())
-- 
cgit v1.2.3