You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2010/03/25 12:41:31 UTC
svn commit: r927354 -
/struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
Author: lukaszlenart
Date: Thu Mar 25 11:41:30 2010
New Revision: 927354
URL: http://svn.apache.org/viewvc?rev=927354&view=rev
Log:
Resolved WW-3405 - escape values in error messages
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl?rev=927354&r1=927353&r2=927354&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl Thu Mar 25 11:41:30 2010
@@ -21,62 +21,62 @@
*/
-->
<#if fieldErrors??><#t/>
-<#assign eKeys = fieldErrors.keySet()><#t/>
-<#assign eKeysSize = eKeys.size()><#t/>
-<#assign doneStartUlTag=false><#t/>
-<#assign doneEndUlTag=false><#t/>
-<#assign haveMatchedErrorField=false><#t/>
-<#if (fieldErrorFieldNames?size > 0) ><#t/>
- <#list fieldErrorFieldNames as fieldErrorFieldName><#t/>
- <#list eKeys as eKey><#t/>
- <#if (eKey = fieldErrorFieldName)><#t/>
- <#assign haveMatchedErrorField=true><#t/>
- <#assign eValue = fieldErrors[fieldErrorFieldName]><#t/>
- <#if (haveMatchedErrorField && (!doneStartUlTag))><#t/>
- <ul<#rt/>
-<#if parameters.id?if_exists != "">
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-<#else>
- class="errorMessage"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
->
- <#assign doneStartUlTag=true><#t/>
- </#if><#t/>
- <#list eValue as eEachValue><#t/>
- <li><span>${eEachValue}</span></li>
- </#list><#t/>
- </#if><#t/>
- </#list><#t/>
- </#list><#t/>
- <#if (haveMatchedErrorField && (!doneEndUlTag))><#t/>
- </ul>
- <#assign doneEndUlTag=true><#t/>
- </#if><#t/>
-<#else><#t/>
- <#if (eKeysSize > 0)><#t/>
- <ul<#rt/>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-<#else>
- class="errorMessage"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
->
- <#list eKeys as eKey><#t/>
- <#assign eValue = fieldErrors[eKey]><#t/>
- <#list eValue as eEachValue><#t/>
- <li><span><#if parameters.escape>${eEachValue!?html}<#else>${eEachValue!}</#if></span></li>
- </#list><#t/>
- </#list><#t/>
- </ul>
- </#if><#t/>
-</#if><#t/>
+ <#assign eKeys = fieldErrors.keySet()><#t/>
+ <#assign eKeysSize = eKeys.size()><#t/>
+ <#assign doneStartUlTag=false><#t/>
+ <#assign doneEndUlTag=false><#t/>
+ <#assign haveMatchedErrorField=false><#t/>
+ <#if (fieldErrorFieldNames?size > 0) ><#t/>
+ <#list fieldErrorFieldNames as fieldErrorFieldName><#t/>
+ <#list eKeys as eKey><#t/>
+ <#if (eKey = fieldErrorFieldName)><#t/>
+ <#assign haveMatchedErrorField=true><#t/>
+ <#assign eValue = fieldErrors[fieldErrorFieldName]><#t/>
+ <#if (haveMatchedErrorField && (!doneStartUlTag))><#t/>
+ <ul<#rt/>
+ <#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+ <#else>
+ class="errorMessage"<#rt/>
+ </#if>
+ <#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ >
+ <#assign doneStartUlTag=true><#t/>
+ </#if><#t/>
+ <#list eValue as eEachValue><#t/>
+ <li><span><#if parameters.escape>${eEachValue!?html}<#else>${eEachValue!}</#if></span></li>
+ </#list><#t/>
+ </#if><#t/>
+ </#list><#t/>
+ </#list><#t/>
+ <#if (haveMatchedErrorField && (!doneEndUlTag))><#t/>
+ </ul>
+ <#assign doneEndUlTag=true><#t/>
+ </#if><#t/>
+ <#else><#t/>
+ <#if (eKeysSize > 0)><#t/>
+ <ul<#rt/>
+ <#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+ <#else>
+ class="errorMessage"<#rt/>
+ </#if>
+ <#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ >
+ <#list eKeys as eKey><#t/>
+ <#assign eValue = fieldErrors[eKey]><#t/>
+ <#list eValue as eEachValue><#t/>
+ <li><span><#if parameters.escape>${eEachValue!?html}<#else>${eEachValue!}</#if></span></li>
+ </#list><#t/>
+ </#list><#t/>
+ </ul>
+ </#if><#t/>
+ </#if><#t/>
</#if><#t/>