Author: mhabersack
Date: 2008-02-06 07:11:27 -0500 (Wed, 06 Feb 2008)
New Revision: 95014
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
Log:
Backport of r95013
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
2008-02-06 12:10:38 UTC (rev 95013)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
2008-02-06 12:11:27 UTC (rev 95014)
@@ -1,3 +1,8 @@
+2008-02-06 Marek Habersack <[EMAIL PROTECTED]>
+
+ * HtmlMeta.cs: render XHTML compliant tag if not in the Legacy
+ mode. Fixes bug #354425
+
2008-01-17 Igor Zelmanovich <[EMAIL PROTECTED]>
* HtmlSelect.cs: refactoring.
Modified:
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
===================================================================
---
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
2008-02-06 12:10:38 UTC (rev 95013)
+++
branches/mono-1-9/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
2008-02-06 12:11:27 UTC (rev 95014)
@@ -32,6 +32,7 @@
using System.Collections;
using System.Security.Permissions;
using System.Web.UI.WebControls;
+using System.Web.Configuration;
namespace System.Web.UI.HtmlControls
{
@@ -112,9 +113,15 @@
protected internal override void Render (HtmlTextWriter writer)
{
- writer.WriteBeginTag (TagName);
- RenderAttributes (writer);
- writer.Write (">");
+ XhtmlConformanceSection xhtml =
WebConfigurationManager.GetSection ("system.web/xhtmlConformance") as
XhtmlConformanceSection;
+
+ if (xhtml != null && xhtml.Mode ==
XhtmlConformanceMode.Legacy)
+ base.Render (writer);
+ else {
+ writer.WriteBeginTag (TagName);
+ RenderAttributes (writer);
+ writer.Write ("/>");
+ }
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
