Author: gonzalo
Date: 2005-06-14 23:16:20 -0400 (Tue, 14 Jun 2005)
New Revision: 46006
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs
Log:
2005-06-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* 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.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-06-15 02:58:59 UTC
(rev 46005)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-06-15 03:16:20 UTC
(rev 46006)
@@ -1,3 +1,9 @@
+2005-06-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* MasterPage.cs: Clear the default content of placeholders before
Modified: trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs 2005-06-15
02:58:59 UTC (rev 46005)
+++ trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs 2005-06-15
03:16:20 UTC (rev 46006)
@@ -246,7 +246,8 @@
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 @@
} 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.");
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
