[asp.net] Ignore JavaScript blocks enclosed in HTML comments

[mono.git] / mcs / class / System.Web / System.Web.Compilation / UserControlBuildProvider.cs

diff --git a/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs b/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs
index cf851a315ef5ea8822c099a8c3241e0742a33a47..fe5d3298cf294138975daadcc695594b61dd8ffb 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/UserControlBuildProvider.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.CodeDom;
@@ -50,16 +49,16 @@ namespace System.Web.Compilation {
                        return new UserControlCompiler (parser as UserControlParser);
                }
 
-               protected override TemplateParser CreateParser (string virtualPath, string physicalPath, HttpContext context)
+               protected override TemplateParser CreateParser (VirtualPath virtualPath, string physicalPath, HttpContext context)
                {       
-                       return CreateParser (virtualPath, physicalPath, OpenReader (virtualPath), context);
+                       return CreateParser (virtualPath, physicalPath, OpenReader (virtualPath.Original), context);
                }
                
-               protected override TemplateParser CreateParser (string virtualPath, string physicalPath, TextReader reader, HttpContext context)
+               protected override TemplateParser CreateParser (VirtualPath virtualPath, string physicalPath, TextReader reader, HttpContext context)
                {
                        return new UserControlParser (virtualPath, physicalPath, reader, context);
                }
        }
 }
-#endif
+