Author: krasnov
Date: 2008-02-06 08:23:22 -0500 (Wed, 06 Feb 2008)
New Revision: 95020
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
* Control.cs: fixed ResolveClientUrlInternal for portal url prefixes
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2008-02-06 13:22:32 UTC
(rev 95019)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2008-02-06 13:23:22 UTC
(rev 95020)
@@ -1,3 +1,7 @@
+2008-02-06 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * Control.cs: fixed ResolveClientUrlInternal for portal url prefixes
+
2008-02-04 Marek Habersack <[EMAIL PROTECTED]>
* SimpleWebHandlerParser.cs: use WebEncoding.FileEncoding when
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2008-02-06 13:22:32 UTC
(rev 95019)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2008-02-06 13:23:22 UTC
(rev 95020)
@@ -1335,6 +1335,12 @@
}
string ResolveClientUrlInternal (string relativeUrl) {
+ if (relativeUrl.StartsWith
(J2EE.J2EEConsts.ACTION_URL_PREFIX, StringComparison.Ordinal))
+ return CreateActionUrl (relativeUrl.Substring
(J2EE.J2EEConsts.ACTION_URL_PREFIX.Length));
+
+ if (relativeUrl.StartsWith
(J2EE.J2EEConsts.RENDER_URL_PREFIX, StringComparison.Ordinal))
+ return ResolveClientUrl (relativeUrl.Substring
(J2EE.J2EEConsts.RENDER_URL_PREFIX.Length));
+
#endif
if (VirtualPathUtility.IsAbsolute (relativeUrl) ||
relativeUrl.IndexOf (':') >= 0)
return relativeUrl;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
