diff options
| author | Daniel J Sell <dredd422@gmail.com> | 2010-11-12 04:57:49 +0300 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2010-11-12 13:24:41 +0300 |
| commit | 5d600522ed12dff1287a6aae292b5bb93d682baa (patch) | |
| tree | 0da46022636108caca72c4e31e548061e759e87c | |
| parent | 2427b2b861bf97db094d1b8208c3913146b00802 (diff) | |
[asp.net] Fix for bug #653192. making MasterPageFile handle relative paths2.8.1
MasterPageFile should be relative to the file being parsed, not the
request path
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/PageParser.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs index 6f92e3c2815..82769d3b2b9 100644 --- a/mcs/class/System.Web/System.Web.UI/PageParser.cs +++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs @@ -404,6 +404,7 @@ namespace System.Web.UI value = GetString (atts, "MasterPageFile", masterPage != null ? masterPage.Value : null); if (!String.IsNullOrEmpty (value)) { if (!BaseParser.IsExpression (value)) { + value = System.Web.VirtualPathUtility.Combine(BaseVirtualDir, value); if (!HostingEnvironment.VirtualPathProvider.FileExists (value)) ThrowParseFileNotFound (value); AddDependency (value); |