[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r130694 - trunk/mcs/class/System.Web/System.Web.UI
From:       "Marek Habersack (grendello () gmail ! com)"
Date:       2009-03-31 18:47:54
Message-ID: 20090331184754.1FC909472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: mhabersack
Date: 2009-03-31 14:47:53 -0400 (Tue, 31 Mar 2009)
New Revision: 130694

Modified:
   trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI/Page.cs
Log:
2009-03-31  Marek Habersack  <mhabersack@novell.com>

	* Page.cs: SavePageViewState saves the list of controls which
	require post back regardless of whether view state is disabled or
	not. Fixes bug #490753

Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog	2009-03-31 18:35:31 UTC (rev \
                130693)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog	2009-03-31 18:47:53 UTC (rev \
130694) @@ -1,5 +1,9 @@
 2009-03-31  Marek Habersack  <mhabersack@novell.com>
 
+	* Page.cs: SavePageViewState saves the list of controls which
+	require post back regardless of whether view state is disabled or
+	not. Fixes bug #490753
+
 	* ApplicationFileParser.cs, MasterPageParser.cs, PageParser.cs,
 	PageThemeFileParser.cs, PageThemeParser.cs, UserControlParser.cs,
 	WebHandlerParser.cs, WebServiceParser.cs: 2.0 constructors take a

Modified: trunk/mcs/class/System.Web/System.Web.UI/Page.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Page.cs	2009-03-31 18:35:31 UTC (rev \
                130693)
+++ trunk/mcs/class/System.Web/System.Web.UI/Page.cs	2009-03-31 18:47:53 UTC (rev \
130694) @@ -1934,15 +1934,15 @@
 #endif
 
 		Pair vsr = null;
+		object viewState = null;
+		
+		if (EnableViewState)
+			viewState = SaveViewStateRecursive ();
+		
+		object reqPostback = (_requiresPostBack != null && _requiresPostBack.Count > 0) ? \
_requiresPostBack : null; +		if (viewState != null || reqPostback != null)
+			vsr = new Pair (viewState, reqPostback);
 
-		if (EnableViewState) {
-			object viewState = SaveViewStateRecursive ();
-			object reqPostback = (_requiresPostBack != null && _requiresPostBack.Count > 0) ? \
                _requiresPostBack : null;
-
-			if (viewState != null || reqPostback != null)
-				vsr = new Pair (viewState, reqPostback);
-		}
-
 		Pair pair = new Pair ();
 		pair.First = vsr;
 #if NET_2_0

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]