Author: mhabersack
Date: 2008-02-06 07:10:38 -0500 (Wed, 06 Feb 2008)
New Revision: 95013

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
Log:
2008-02-06  Marek Habersack  <[EMAIL PROTECTED]>

        * HtmlMeta.cs: render XHTML compliant tag if not in the Legacy
        mode. Fixes bug #3544252008-02-06  Marek Habersack  <[EMAIL PROTECTED]>



Modified: trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog     
2008-02-06 12:02:59 UTC (rev 95012)
+++ trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog     
2008-02-06 12:10:38 UTC (rev 95013)
@@ -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: trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs   
2008-02-06 12:02:59 UTC (rev 95012)
+++ trunk/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlMeta.cs   
2008-02-06 12:10:38 UTC (rev 95013)
@@ -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

Reply via email to