Author: igorz
Date: 2007-05-02 05:45:24 -0400 (Wed, 02 May 2007)
New Revision: 76558
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
2007-05-02 Igor Zelmanovich <[EMAIL PROTECTED]>
* Control.cs:
ResolveClientUrl considers TemplateSourceDirectory property.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-05-02 09:42:51 UTC
(rev 76557)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-05-02 09:45:24 UTC
(rev 76558)
@@ -1,3 +1,8 @@
+2007-05-02 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * Control.cs:
+ ResolveClientUrl considers TemplateSourceDirectory property.
+
2007-05-01 Marek Habersack <[EMAIL PROTECTED]>
* PageParser.cs: clientTarget comparisons must be case-insensitive
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-05-02 09:42:51 UTC
(rev 76557)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-05-02 09:45:24 UTC
(rev 76558)
@@ -1204,7 +1204,11 @@
if (relativeUrl.Length == 0)
return String.Empty;
- if (Context != null && Context.Request != null &&
VirtualPathUtility.IsAppRelative (relativeUrl)) {
+ if (VirtualPathUtility.IsAbsolute (relativeUrl) ||
relativeUrl.IndexOf (':') >= 0)
+ return relativeUrl;
+
+ if (Context != null && Context.Request != null &&
TemplateSourceDirectory != null) {
+ relativeUrl = VirtualPathUtility.Combine
(VirtualPathUtility.AppendTrailingSlash (TemplateSourceDirectory), relativeUrl);
string basePath = Context.Request.FilePath;
if (basePath.Length > 1 && basePath
[basePath.Length - 1] != '/') {
basePath =
VirtualPathUtility.GetDirectory (basePath);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
