In .:

[mono.git] / mcs / class / System.Web / System.Web.UI.HtmlControls / HtmlInputControl.cs

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
index 93a631c8738b84f826db2465200285020716fffd..8aea7b8d1110f61bee0cd98cb530aff91e76a5dc 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
@@ -100,7 +100,7 @@ namespace System.Web.UI.HtmlControls {
                protected override void RenderAttributes (HtmlTextWriter writer)
                {
                        if (Attributes ["name"] == null) {
-                               writer.WriteAttribute ("name", ClientID);
+                               writer.WriteAttribute ("name", Name);
                        }
 #if NET_2_0
                        Attributes.Remove ("type");
@@ -110,9 +110,10 @@ namespace System.Web.UI.HtmlControls {
                        writer.Write (" /");
 
 #if NET_2_0
-                       if (Page.Form.SubmitDisabledControls && Page.Form.DetermineRenderUplevel() && !Disabled)
-                               Page.ClientScript.RegisterArrayDeclaration ("__enabledControlArray", String.Format ("'{0}'", ID));
+                       if (Page != null && Page.Form != null && Page.Form.SubmitDisabledControls && Page.Form.DetermineRenderUplevel() && !Disabled)
+                               Page.ClientScript.RegisterArrayDeclaration ("__enabledControlArray", String.Format ("'{0}'", ClientID));
 #endif
                }
        }
 }
+