Author: krasnov
Date: 2008-02-13 05:11:06 -0500 (Wed, 13 Feb 2008)
New Revision: 95564
Modified:
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
Log:
merge -r95562:95563
Modified:
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
2008-02-13 10:09:28 UTC (rev 95563)
+++
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
2008-02-13 10:11:06 UTC (rev 95564)
@@ -1,3 +1,8 @@
+2008-02-13 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * HtmlForm.cs: fixed action attribute in RenderAttributes under
+ TARGET_JVM
+
2008-02-06 Marek Habersack <[EMAIL PROTECTED]>
* HtmlMeta.cs: render XHTML compliant tag if not in the Legacy
Modified:
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
===================================================================
---
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
2008-02-13 10:09:28 UTC (rev 95563)
+++
branches/mainsoft/gh2.2/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
2008-02-13 10:11:06 UTC (rev 95564)
@@ -260,8 +260,11 @@
#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;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
