X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.Compilation%2FThemeDirectoryCompiler.jvm.cs;h=097bc82030fec7de41fc316a32d9d5ca8c394af4;hb=96b54e28f09a43a3563572024f151ccb7da384bd;hp=73844ba3c0ed9fa2b985fb2c8e23eb23e9a519f1;hpb=69566b12ebc97387387fe5e34fdc53273c57674b;p=mono.git diff --git a/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.jvm.cs b/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.jvm.cs index 73844ba3c0e..097bc82030f 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.jvm.cs +++ b/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.jvm.cs @@ -35,7 +35,7 @@ using System.Collections; using System.IO; using System.Web; using System.Web.Compilation; -using System.Web.Util; +using System.Web.Util; using System.Web.J2EE; namespace System.Web.UI @@ -43,13 +43,14 @@ namespace System.Web.UI internal sealed class ThemeDirectoryCompiler { public static PageTheme GetCompiledInstance (string virtualPath, HttpContext context) - { - string resolvedUrl = System.Web.Util.UrlUtils.ResolveVirtualPathFromAppAbsolute (virtualPath).TrimEnd('/'); - Type tmpType = PageMapper.GetObjectType (resolvedUrl); - if (tmpType == null) - throw new InvalidOperationException("ThemeDirectoryCompiler '" + virtualPath + "' not found"); - - Object obj = Activator.CreateInstance(tmpType); + { + virtualPath = "~/App_Themes/" + virtualPath + "/"; + string resolvedUrl = System.Web.Util.UrlUtils.ResolveVirtualPathFromAppAbsolute (virtualPath).TrimEnd('/'); + Type tmpType = PageMapper.GetObjectType (context, resolvedUrl); + if (tmpType == null) + throw new InvalidOperationException("ThemeDirectoryCompiler '" + virtualPath + "' not found"); + + Object obj = Activator.CreateInstance(tmpType); return (PageTheme)obj; } }