svn commit: r680739 - /struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl

[mu...@apache.org]

Author: musachy
Date: Tue Jul 29 08:39:34 2008
New Revision: 680739

URL: http://svn.apache.org/viewvc?rev=680739&view=rev
Log:
WW-1677 <s:submit type="button" does not render the enclosed content inside properly

${parameters.body} is not only the body of the tag but also the html opening of the tag, so it cannot be escaped

Modified:
    struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl?rev=680739&r1=680738&r2=680739&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit-close.ftl Tue Jul 29 08:39:34 2008
@@ -1,4 +1,4 @@
 <#if parameters.type?exists && parameters.type=="button">
-<#if (parameters.body)?default("")?length gt 0><@s.property value="parameters.body"/><#elseif parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if>
+<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if>
 </button>
 </#if>