diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2010-06-17 04:56:39 +0400 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2010-06-17 04:56:39 +0400 |
| commit | 369fb5ad04378842f57272438f4d22e6467dea88 (patch) | |
| tree | 942a41509fbf28e55887d1418c9e01ea4a576161 /mcs/class | |
| parent | 449525c8a13b3329a78178818640040c5860cff1 (diff) | |
Backport of r159046
svn path=/branches/mono-2-6/mcs/; revision=159047
Diffstat (limited to 'mcs/class')
3 files changed, 6 insertions, 5 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 87f6a9461ca..fa6c82d9f1e 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,8 @@ +2010-06-17 Marek Habersack <mhabersack@novell.com> + + * RootBuilder.cs: both LINK and META HTML tags must be represented + as instances of HtmlGenericControl. Fixes bug #603541 + 2010-05-19 Marek Habersack <mhabersack@novell.com> * DataSourceCacheDurationConverter.cs: implemented. Fixes bug diff --git a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs index 444eb42640c..b072af77b4d 100644 --- a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs +++ b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs @@ -70,10 +70,6 @@ namespace System.Web.UI { #endif htmlControls.Add ("IMG", typeof (HtmlImage)); htmlControls.Add ("INPUT", "INPUT"); -#if NET_2_0 - htmlControls.Add ("LINK", typeof (HtmlLink)); - htmlControls.Add ("META", typeof (HtmlLink)); -#endif htmlControls.Add ("SELECT", typeof (HtmlSelect)); htmlControls.Add ("TABLE", typeof (HtmlTable)); htmlControls.Add ("TD", typeof (HtmlTableCell)); diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs index ec5560dfd07..9d2f2f77413 100644 --- a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs +++ b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs @@ -235,7 +235,7 @@ namespace MonoTests.System.Web.Compilation { string pageHtml = new WebTest ("ConditionalClientComments.aspx").Run (); string renderedHtml = HtmlDiff.GetControlFromPageHtml (pageHtml); string originalHtml = @"<!--[if IE 6]> - <link rel=""styleheet"" type=""text/css"" href=""compat-ie6.css"" /> + <link rel=""styleheet"" type=""text/css"" href=""~/compat-ie6.css""></link> <![endif]-->"; HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "#A1"); } |