svn commit: r816472 - /struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java

[pbenedict]

Author: pbenedict
Date: Fri Sep 18 06:01:11 2009
New Revision: 816472

URL: http://svn.apache.org/viewvc?rev=816472&view=rev
Log:
STR-2893: Backport to 1.3

Modified:
    
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java

Modified: 
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?rev=816472&r1=816471&r2=816472&view=diff
==============================================================================
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
 Fri Sep 18 06:01:11 2009
@@ -725,11 +725,10 @@
         results.append(">");
         results.append(lineEnd);
 
-        // xhtml script content shouldn't use the browser hiding trick
-        if (!this.isXhtml()) {
-            results.append("  <!--");
-            results.append(lineEnd);
-        }
+        // xhtml content should emit CDATA section
+        // but html content should use the browser hiding trick
+        results.append(isXhtml() ? "//<![CDATA[" : "<!--");
+        results.append(lineEnd);
 
         // Construct the index if needed and insert into focus statement
         String index = "";
@@ -767,10 +766,9 @@
         results.append("  }");
         results.append(lineEnd);
 
-        if (!this.isXhtml()) {
-            results.append("  // -->");
-            results.append(lineEnd);
-        }
+        results.append("//");
+        results.append(isXhtml() ? "]]>" : "-->");
+        results.append(lineEnd);
 
         results.append("</script>");
         results.append(lineEnd);