From 56fee292c37e162c03fab9eeadd6a8b9ab85c251 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 4 Sep 2006 19:15:47 +0000
Subject: merge from 3.0 branch till 1387

---
 framework/Web/UI/TPage.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'framework/Web/UI/TPage.php')

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 2bdfd3cf..fe8482ce 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -843,13 +843,17 @@ class TPage extends TTemplateControl
 					if($control->loadPostData($key,$postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
-				else if($control instanceof IPostBackEventHandler)
+				else if($control instanceof IPostBackEventHandler && 
+					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
+				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // not calling setPostBackEventTarget() because the control may be removed later
+				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 			else if($beforeLoad)
 				$this->_restPostData->add($key,$value);
 		}
+
 		foreach($this->_controlsRequiringPostData as $key=>$value)
 		{
 			if($control=$this->findControl($key))
-- 
cgit v1.2.3