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>
<#if parameters.name?has_content>
- name="${parameters.name?html}"<#rt/>
+ name="${parameters.name}"<#rt/>
#if>
- id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
+ id="${parameters.id}${itemKeyStr}"<#rt/>
<#if tag.contains(parameters.nameValue!'', itemKey)>
checked="checked"<#rt/>
#if>
@@ -93,7 +93,7 @@
<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
/><#rt/>
-><#rt/>
+><#rt/>
${itemValue}<#t/>
@s.iterator>
\ No newline at end of file
diff --git a/core/src/main/resources/template/simple/scripting-events.ftl b/core/src/main/resources/template/simple/scripting-events.ftl
index f0e7a84df..076955d18 100644
--- a/core/src/main/resources/template/simple/scripting-events.ftl
+++ b/core/src/main/resources/template/simple/scripting-events.ftl
@@ -19,44 +19,44 @@
*/
-->
<#if parameters.onclick??>
- onclick="${parameters.onclick?html}"<#rt/>
+ onclick="${parameters.onclick}"<#rt/>
#if>
<#if parameters.ondblclick??>
- ondblclick="${parameters.ondblclick?html}"<#rt/>
+ ondblclick="${parameters.ondblclick}"<#rt/>
#if>
<#if parameters.onmousedown??>
- onmousedown="${parameters.onmousedown?html}"<#rt/>
+ onmousedown="${parameters.onmousedown}"<#rt/>
#if>
<#if parameters.onmouseup??>
- onmouseup="${parameters.onmouseup?html}"<#rt/>
+ onmouseup="${parameters.onmouseup}"<#rt/>
#if>
<#if parameters.onmouseover??>
- onmouseover="${parameters.onmouseover?html}"<#rt/>
+ onmouseover="${parameters.onmouseover}"<#rt/>
#if>
<#if parameters.onmousemove??>
- onmousemove="${parameters.onmousemove?html}"<#rt/>
+ onmousemove="${parameters.onmousemove}"<#rt/>
#if>
<#if parameters.onmouseout??>
- onmouseout="${parameters.onmouseout?html}"<#rt/>
+ onmouseout="${parameters.onmouseout}"<#rt/>
#if>
<#if parameters.onfocus??>
- onfocus="${parameters.onfocus?html}"<#rt/>
+ onfocus="${parameters.onfocus}"<#rt/>
#if>
<#if parameters.onblur??>
- onblur="${parameters.onblur?html}"<#rt/>
+ onblur="${parameters.onblur}"<#rt/>
#if>
<#if parameters.onkeypress??>
- onkeypress="${parameters.onkeypress?html}"<#rt/>
+ onkeypress="${parameters.onkeypress}"<#rt/>
#if>
<#if parameters.onkeydown??>
- onkeydown="${parameters.onkeydown?html}"<#rt/>
+ onkeydown="${parameters.onkeydown}"<#rt/>
#if>
<#if parameters.onkeyup??>
- onkeyup="${parameters.onkeyup?html}"<#rt/>
+ onkeyup="${parameters.onkeyup}"<#rt/>
#if>
<#if parameters.onselect??>
- onselect="${parameters.onselect?html}"<#rt/>
+ onselect="${parameters.onselect}"<#rt/>
#if>
<#if parameters.onchange??>
- onchange="${parameters.onchange?html}"<#rt/>
+ onchange="${parameters.onchange}"<#rt/>
#if>
\ No newline at end of file