Author: mhabersack
Date: 2007-03-26 07:31:45 -0500 (Mon, 26 Mar 2007)
New Revision: 74976
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
Log:
2007-03-26 Marek Habersack <[EMAIL PROTECTED]>
* TemplateControl.cs: make local resources work with master
pages - use the AppRelativeVirtualPath for resource resolution.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-03-26 12:13:04 UTC
(rev 74975)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-03-26 12:31:45 UTC
(rev 74976)
@@ -1,5 +1,8 @@
2007-03-26 Marek Habersack <[EMAIL PROTECTED]>
+ * TemplateControl.cs: make local resources work with master
+ pages - use the AppRelativeVirtualPath for resource resolution.
+
* TemplateParser.cs: support the meta:resourcekey attribute in
Page and Control directives. Fixes bug #81204.
Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-03-26
12:13:04 UTC (rev 74975)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-03-26
12:31:45 UTC (rev 74976)
@@ -288,7 +288,8 @@
protected object GetLocalResourceObject (string resourceKey)
{
- return HttpContext.GetLocalResourceObject
(Context.Request.CurrentExecutionFilePath, resourceKey);
+ return HttpContext.GetLocalResourceObject
(VirtualPathUtility.ToAbsolute (this.AppRelativeVirtualPath),
+ resourceKey);
}
protected object GetLocalResourceObject (string resourceKey,
Type objType, string propName)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
