2008-07-14 Marek Habersack <mhabersack@novell.com>

* Page.cs: fix the failing tests by moving the form RaisePostBackEvent code up in RaisePostBackEvents, so that Validate () isn't called together with the registered post back events. svn path=/trunk/mcs/; revision=107911
baulig · Jul 14, 2008 · ca03531 · ca03531
1 parent a60f024
commit ca03531
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-14  Marek Habersack  <mhabersack@novell.com>
+
+	* Page.cs: fix the failing tests by moving the form
+	RaisePostBackEvent code up in RaisePostBackEvents, so that
+	Validate () isn't called together with the registered post back
+	events.
+
 2008-07-10  Roei Erez  <roeie@mainsoft.com>
 
 	* ClientScriptManager.cs: Bug in javacript code, usind window scope instead of document.

diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -1715,14 +1715,17 @@ void RaisePostBackEvents ()
 			return;
 		}
 
+		if (formPostedRequiresRaiseEvent != null) {
+			RaisePostBackEvent (formPostedRequiresRaiseEvent, null);
+			return;
+		}
+
 		NameValueCollection postdata = _requestValueCollection;
 		if (postdata == null)
 			return;
 
 		string eventTarget = postdata [postEventSourceID];
 		if (eventTarget == null || eventTarget.Length == 0) {
-			if (formPostedRequiresRaiseEvent != null)
-				RaisePostBackEvent (formPostedRequiresRaiseEvent, null);
 			Validate ();
 			return;
                 }