2009-01-09 Marek Habersack <mhabersack@novell.com>

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

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

diff --git a/mcs/class/System.Web/System.Web.UI/BaseParser.cs b/mcs/class/System.Web/System.Web.UI/BaseParser.cs
index 1d7cbf3c2e413813c59c0ffbffaa285c4e860169..aafaf569e8daf679ac5192e6818ade47d95ab057 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/BaseParser.cs
+++ b/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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 7b0a0177808958d75a6967f4b3fa08ca456c1c75..ff45f979a9da77dbd1ac3de3794fa806fe6efac7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-09  Marek Habersack  <mhabersack@novell.com>
+
+       * BaseParser.cs, PageParser.cs, UserControlParser.cs: use
+       VirtualPathUtility.GetDirectory instead of UrlUtils.GetDirectory.
 
 2008-12-25 Gonzalo Paniagua Javier <gonzalo@novell.com>
 

diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs
index e6c873c0edb569f23814efea545e594052f83f71..8231f0294981c52c6f766421a11b7e1b0d11fb07 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/PageParser.cs
+++ b/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;

diff --git a/mcs/class/System.Web/System.Web.UI/UserControlParser.cs b/mcs/class/System.Web/System.Web.UI/UserControlParser.cs
index 3a5e8af74b9331136864490da441779a35141efd..48bbb4bac574bf337f51abe892dd5dffa3424001 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/UserControlParser.cs
+++ b/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