diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-06-15 07:22:46 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2005-06-15 07:22:46 +0400 |
| commit | 467094bf19ed648481194cd7d436a62105423b93 (patch) | |
| tree | a19a3efd859fae50c8adb5c37fc87657fcd8b4c9 | |
| parent | 045f78538a13fd6be06b65f61dcf2f3f93cca9ec (diff) | |
2005-06-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* PageParser.cs: don't try to compile the master page if it wan't
provided. Use MapPath from the base classes instead of the long
version. Fixes bug #75269 that prevented xsp2 from working properly.
svn path=/tags/mono-1-1-8/mcs/; revision=46007
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/PageParser.cs | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 86caa9a8020..74edbb8194d 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,9 @@ +2005-06-14 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * PageParser.cs: don't try to compile the master page if it wan't + provided. Use MapPath from the base classes instead of the long + version. Fixes bug #75269 that prevented xsp2 from working properly. + 2005-06-13 Lluis Sanchez Gual <lluis@novell.com> * MasterPage.cs: Clear the default content of placeholders before diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs index 8490c6e4850..aa145cd3df9 100644 --- a/mcs/class/System.Web/System.Web.UI/PageParser.cs +++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs @@ -246,7 +246,8 @@ namespace System.Web.UI masterPage = GetString (atts, "MasterPageFile", null); // Make sure the page exists - MasterPageParser.GetCompiledMasterType (masterPage, HttpContext.Current.Request.MapPath (masterPage), HttpContext.Current); + if (masterPage != null) + MasterPageParser.GetCompiledMasterType (masterPage, MapPath (masterPage), HttpContext.Current); #endif // Ignored by now GetString (atts, "EnableViewStateMac", null); @@ -267,7 +268,7 @@ namespace System.Web.UI } else { string path = GetString (atts, "VirtualPath", null); if (path != null) - masterType = MasterPageParser.GetCompiledMasterType (path, HttpContext.Current.Request.MapPath (path), HttpContext.Current); + masterType = MasterPageParser.GetCompiledMasterType (path, MapPath (path), HttpContext.Current); else ThrowParseException ("The MasterType directive must have either a TypeName or a VirtualPath attribute."); } |