Author: musachy Date: Fri Oct 26 06:38:35 2007 New Revision: 588640 URL: http://svn.apache.org/viewvc?rev=588640&view=rev Log: use ?default instead of ! for people using older freemarker versions
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl?rev=588640&r1=588639&r2=588640&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl Fri Oct 26 06:38:35 2007 @@ -66,7 +66,7 @@ <#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> <span class="required">*</span><#t/> </#if> -${parameters.labelseparator!":"?html}<#t/> +${parameters.labelseparator?default(":")?html}<#t/> <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> </label><#t/> </#if>