diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index a70dde64e..cb3b4ce08 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -339,7 +339,7 @@ public class FreemarkerManager { } protected Version getFreemarkerVersion(ServletContext servletContext) { - Version incompatibleImprovements = Configuration.VERSION_2_3_0; + Version incompatibleImprovements = Configuration.VERSION_2_3_28; String incompatibleImprovementsParam = servletContext.getInitParameter("freemarker." + Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE); if (incompatibleImprovementsParam != null) { diff --git a/core/src/main/resources/template/simple/radiomap.ftl b/core/src/main/resources/template/simple/radiomap.ftl index cdff00ec0..5668d2ba0 100644 --- a/core/src/main/resources/template/simple/radiomap.ftl +++ b/core/src/main/resources/template/simple/radiomap.ftl @@ -60,9 +60,9 @@ <#if parameters.name?has_content> - name="${parameters.name?html}"<#rt/> + name="${parameters.name}"<#rt/> - id="${parameters.id?html}${itemKeyStr?html}"<#rt/> + id="${parameters.id}${itemKeyStr}"<#rt/> <#if tag.contains(parameters.nameValue!'', itemKey)> checked="checked"<#rt/> @@ -93,7 +93,7 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> /><#rt/> -