Merge pull request #4453 from lambdageek/bug-49721

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / FormParameter.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
index 9d52e82cda38d0a585df77a2c1924bdaae6f2938..56ad7b4a1dfd4b77986f0b0c24119ed88e7041ce 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs
@@ -28,18 +28,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Collections;
 using System.Collections.Specialized;
 using System.Data;
 using System.Text;
 using System.ComponentModel;
 
-namespace System.Web.UI.WebControls {
-
+namespace System.Web.UI.WebControls
+{
        [DefaultPropertyAttribute ("FormField")]
-       public class FormParameter : Parameter {
-
+       public class FormParameter : Parameter
+       {
                public FormParameter () : base ()
                {
                }
@@ -68,17 +67,14 @@ namespace System.Web.UI.WebControls {
                {
                        return new FormParameter (this);
                }
-#if NET_4_0
                protected internal
-#else
-               protected
-#endif
-               override object Evaluate (HttpContext ctx, Control control)
+               override object Evaluate (HttpContext context, Control control)
                {
-                       if (control == null || ctx.Request == null)
+                       HttpRequest req = context != null ? context.Request : null;
+                       if (req == null)
                                return null;
                        
-                       return ctx.Request.Form [FormField];
+                       return req.Form [FormField];
                }
                
                [DefaultValueAttribute ("")]
@@ -88,7 +84,7 @@ namespace System.Web.UI.WebControls {
                                if (s != null)
                                        return s;
                                
-                               return "";
+                               return String.Empty;
                        }
                        set {
                                if (FormField != value) {
@@ -99,5 +95,5 @@ namespace System.Web.UI.WebControls {
                }
        }
 }
-#endif
+