2009-01-09 Marek Habersack <[email protected]>

	* BaseParser.cs, PageParser.cs, UserControlParser.cs: use
	VirtualPathUtility.GetDirectory instead of UrlUtils.GetDirectory.

svn path=/trunk/mcs/; revision=122893

mcs/class/System.Web/System.Web.UI/BaseParser.cs

@@ -137,12 +137,12 @@ namespace System.Web.UI
 		internal virtual string BaseVirtualDir {
 			get {
 				if (baseVDir == null)
-					baseVDir = UrlUtils.GetDirectory (context.Request.FilePath);
-
+					baseVDir = VirtualPathUtility.GetDirectory (context.Request.FilePath);
+				
 				return baseVDir;
 			}
 
-			set { 
+			set {
 				if (VirtualPathUtility.IsRooted (value))
 					baseVDir = VirtualPathUtility.ToAbsolute (value);
 				else

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,7 @@
+2009-01-09  Marek Habersack  <[email protected]>
+
+	* BaseParser.cs, PageParser.cs, UserControlParser.cs: use
+	VirtualPathUtility.GetDirectory instead of UrlUtils.GetDirectory.
 
 2008-12-25 Gonzalo Paniagua Javier <[email protected]>
 

mcs/class/System.Web/System.Web.UI/PageParser.cs

@@ -86,7 +86,7 @@ namespace System.Web.UI
 		internal PageParser (string virtualPath, string inputFile, HttpContext context)
 		{
 			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
+			BaseVirtualDir = VirtualPathUtility.GetDirectory (virtualPath, false);
 			InputFile = inputFile;
 			SetBaseType (null);
 			AddApplicationAssembly ();
@@ -105,7 +105,7 @@ namespace System.Web.UI
 		internal PageParser (string virtualPath, string inputFile, TextReader reader, HttpContext context)
 		{
 			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
+			BaseVirtualDir = VirtualPathUtility.GetDirectory (virtualPath, false);
 			Reader = reader;
 			if (String.IsNullOrEmpty (inputFile)) {
 				HttpRequest req = context != null ? context.Request : null;

mcs/class/System.Web/System.Web.UI/UserControlParser.cs

@@ -56,7 +56,7 @@ namespace System.Web.UI
 		internal UserControlParser (string virtualPath, string inputFile, HttpContext context, string type)
 		{
 			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
+			BaseVirtualDir = VirtualPathUtility.GetDirectory (virtualPath, false);
 			InputFile = inputFile;
 			SetBaseType (type);
 			AddApplicationAssembly ();
@@ -71,7 +71,7 @@ namespace System.Web.UI
 		internal UserControlParser (string virtualPath, string inputFile, TextReader reader, HttpContext context)
 		{
 			Context = context;
-			BaseVirtualDir = UrlUtils.GetDirectory (virtualPath);
+			BaseVirtualDir = VirtualPathUtility.GetDirectory (virtualPath, false);
 
 			if (String.IsNullOrEmpty (inputFile)) {
 				HttpRequest req = context != null ? context.Request : null;
@@ -90,7 +90,7 @@ namespace System.Web.UI
 			Context = context;
 
 			string fpath = context.Request.FilePath;
-			BaseVirtualDir = UrlUtils.GetDirectory (fpath);
+			BaseVirtualDir = VirtualPathUtility.GetDirectory (fpath, false);
 
 			// We're probably being called by ParseControl - let's use the requested
 			// control's path plus unique suffix as our input file, since that's the