Browse Source

2009-03-31 Marek Habersack <[email protected]>

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

svn path=/trunk/mcs/; revision=130694
Marek Habersack 17 years ago
parent
commit
91053b46db

+ 4 - 0
mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,5 +1,9 @@
 2009-03-31  Marek Habersack  <[email protected]>
 
+	* 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

+ 8 - 8
mcs/class/System.Web/System.Web.UI/Page.cs

@@ -1934,14 +1934,14 @@ public partial class Page : TemplateControl, IHttpHandler
 #endif
 
 		Pair vsr = null;
-
-		if (EnableViewState) {
-			object viewState = SaveViewStateRecursive ();
-			object reqPostback = (_requiresPostBack != null && _requiresPostBack.Count > 0) ? _requiresPostBack : null;
-
-			if (viewState != null || reqPostback != null)
-				vsr = new Pair (viewState, reqPostback);
-		}
+		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);
 
 		Pair pair = new Pair ();
 		pair.First = vsr;