diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-03-31 01:22:48 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-03-31 01:22:48 +0400 |
| commit | bd0bcede7e596c1df2be529975991816e3a265c7 (patch) | |
| tree | 7ebfde21b47a1dc9c557cb4a81035294c1487568 /mcs | |
| parent | 4a6566948f30c2a6a0db52367349639814dbe409 (diff) | |
undo
svn path=/branches/mono-2-6/mcs/; revision=154499
Diffstat (limited to 'mcs')
7 files changed, 5 insertions, 26 deletions
diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog index 154bcddba60..eb590e08b61 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog +++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog @@ -1,8 +1,3 @@ -2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com> - - * PageCompiler.cs: default for EnableViewStateMac is true. Allow - setting it from a @Page directive. - 2010-03-06 Marek Habersack <mhabersack@novell.com> * TemplateControlCompiler.cs: AssignPropertyForResources localizes diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs index f5783803bec..5c3fdc24c56 100644 --- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs +++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs @@ -425,12 +425,6 @@ namespace System.Web.Compilation method.Statements.Add (expr); } #endif - if (!pageParser.EnableViewStateMac) { - CodeAssignStatement stmt = new CodeAssignStatement (); - stmt.Left = new CodePropertyReferenceExpression (thisRef, "EnableViewStateMac"); - stmt.Right = new CodePrimitiveExpression (false); - method.Statements.Add (stmt); - } } #if NET_2_0 diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog index fdf48f4c759..7e327890514 100644 --- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog +++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog @@ -1,8 +1,3 @@ -2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com> - - * PagesConfiguration.cs: default for EnableViewStateMac is true. Allow - setting it from a @Page directive. - 2009-05-14 Marek Habersack <mhabersack@novell.com> * HandlerFactoryConfiguration.cs: if we're matching a default diff --git a/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs index e9e82425eff..4bc4bad718f 100644 --- a/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs +++ b/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs @@ -38,7 +38,7 @@ namespace System.Web.Configuration internal bool Buffer = true; internal PagesEnableSessionState EnableSessionState = PagesEnableSessionState.True; internal bool EnableViewState = true; - internal bool EnableViewStateMac = true; + internal bool EnableViewStateMac = false; internal bool SmartNavigation = false; internal bool AutoEventWireup = true; internal bool ValidateRequest = true; diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 0ea479e5969..b5fa0fb6488 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,9 +1,3 @@ -2010-03-30 Gonzalo Paniagua Javier <gonzalo@novell.com> - - * PageParser.cs: - * Page.cs: default for EnableViewStateMac is true. Allow setting it - from a @Page directive. - 2010-01-20 Marek Habersack <mhabersack@novell.com> * ObjectStateFormatter.cs: implemented support for IndexedString diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs index 1797d897fad..2148abd64db 100644 --- a/mcs/class/System.Web/System.Web.UI/Page.cs +++ b/mcs/class/System.Web/System.Web.UI/Page.cs @@ -83,7 +83,7 @@ public partial class Page : TemplateControl, IHttpHandler bool _hasEnabledControlArray; #endif bool _viewState; - bool _viewStateMac = true; + bool _viewStateMac; string _errorPage; bool is_validated; bool _smartNavigation; diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs index c971723d5c2..ea6b10ed24f 100644 --- a/mcs/class/System.Web/System.Web.UI/PageParser.cs +++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs @@ -383,8 +383,9 @@ namespace System.Web.UI enable_event_validation = GetBool (atts, "EnableEventValidation", enable_event_validation); maintainScrollPositionOnPostBack = GetBool (atts, "MaintainScrollPositionOnPostBack", maintainScrollPositionOnPostBack); #endif - enableViewStateMac = GetBool (atts, "EnableViewStateMac", enableViewStateMac); - smartNavigation = GetBool (atts, "SmartNavigation", smartNavigation); + // Ignored by now + GetString (atts, "EnableViewStateMac", null); + GetString (atts, "SmartNavigation", null); base.ProcessMainAttributes (atts); } |