* HtmlForm.cs: fixed action attribute in RenderAttributes under TARGET_JVM

svn path=/trunk/mcs/; revision=95563

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
index cc948efdc3c3c123d2034ebb376a5d6be23232a6..836d7b2cc23dd7d9f7e7bd6837bdc7bd78251a31 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * HtmlForm.cs: fixed action attribute in RenderAttributes under
+       TARGET_JVM
+
 2008-02-06  Marek Habersack  <mhabersack@novell.com>
 
        * HtmlMeta.cs: render XHTML compliant tag if not in the Legacy

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
index 4830e2eb1c40dbe11874a81f226b08866fdc90b7..ec4ca8a5541be08a6f2b0883afef0cdd99a92303 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
@@ -260,8 +260,11 @@ namespace System.Web.UI.HtmlControls
 #else
                        // Allow the page to transform action to a portlet action url
                        string customAction = Attributes ["action"];
-                       if (String.IsNullOrEmpty(customAction))
-                               action = CreateActionUrl (VirtualPathUtility.ToAppRelative (Page.Request.CurrentExecutionFilePath) + Page.Request.QueryStringRaw);
+                       if (String.IsNullOrEmpty (customAction)) {
+                               string queryString = Page.Request.QueryStringRaw;
+                               action = CreateActionUrl (VirtualPathUtility.ToAppRelative (Page.Request.CurrentExecutionFilePath) +
+                                       (string.IsNullOrEmpty (queryString) ? string.Empty : "?" + queryString));
+                       }
                        else
                                action = customAction;