From 796c15ee673247fe6c0c23da0b4e29a6ec4bb29d Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 12 Dec 2018 08:57:24 +0100 Subject: [PATCH 1/5] WW-4972 Switches incompatible_improvements to VERSION_2_3_28 --- .../views/freemarker/FreemarkerManager.java | 2 +- .../resources/template/simple/radiomap.ftl | 6 ++-- .../template/simple/scripting-events.ftl | 28 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) 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/> -<#rt/> +>${parameters.label}<#rt/> @@ -87,14 +87,14 @@ lables <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> <#if parameters.id??> - for="${parameters.id?html}"<#rt/> + for="${parameters.id}"<#rt/> <#if hasFieldErrors> class="checkboxErrorLabel"<#rt/> <#else> class="checkboxLabel"<#rt/> ->${parameters.label?html}<#rt/> +>${parameters.label}<#rt/> <#if parameters.label??> diff --git a/core/src/main/resources/template/css_xhtml/controlfooter.ftl b/core/src/main/resources/template/css_xhtml/controlfooter.ftl index c4b06b6fb..d90fa7b55 100644 --- a/core/src/main/resources/template/css_xhtml/controlfooter.ftl +++ b/core/src/main/resources/template/css_xhtml/controlfooter.ftl @@ -40,7 +40,7 @@ ${parameters.after!}<#t/> errorFor="${parameters.id}"<#rt/> class="errorMessage"> - ${error?html} + ${error} <#t/> <#t/> diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl index 028957fd4..d7aacf602 100644 --- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl @@ -34,7 +34,7 @@ errorFor="${parameters.id}"<#rt/> class="errorMessage"> - ${error?html} + ${error} <#t/> <#t/> @@ -55,7 +55,7 @@ <#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/> class="wwlbl"> <#t/> <#if (labelpos!"top") == 'top'> diff --git a/core/src/main/resources/template/css_xhtml/label.ftl b/core/src/main/resources/template/css_xhtml/label.ftl index 2a2624cfc..03c6a6192 100644 --- a/core/src/main/resources/template/css_xhtml/label.ftl +++ b/core/src/main/resources/template/css_xhtml/label.ftl @@ -22,19 +22,19 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /> <#if parameters.id??> - id="${parameters.id?html}"<#rt/> + id="${parameters.id}"<#rt/> <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#if parameters.for??> - for="${parameters.for?html}"<#rt/> + for="${parameters.for}"<#rt/> ><#rt/> <#if parameters.nameValue??> diff --git a/core/src/main/resources/template/simple/a-close.ftl b/core/src/main/resources/template/simple/a-close.ftl index 78b319c48..fb532f49e 100644 --- a/core/src/main/resources/template/simple/a-close.ftl +++ b/core/src/main/resources/template/simple/a-close.ftl @@ -20,22 +20,22 @@ --> <#if parameters.id??> - id="${parameters.id?html}"<#rt/> + id="${parameters.id}"<#rt/> <#if parameters.href??> - href="${parameters.href}"<#rt/> + href="${parameters.href?no_esc}"<#rt/> <#if parameters.tabindex??> - tabindex="${parameters.tabindex?html}"<#rt/> + tabindex="${parameters.tabindex}"<#rt/> <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> <#if parameters.title??> - title="${parameters.title?html}"<#rt/> + title="${parameters.title}"<#rt/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> diff --git a/core/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl index 16a9a4750..37e1a2e85 100644 --- a/core/src/main/resources/template/simple/actionerror.ftl +++ b/core/src/main/resources/template/simple/actionerror.ftl @@ -21,20 +21,20 @@ <#if (actionErrors?? && actionErrors?size > 0)> <#if parameters.id??> - id="${parameters.id?html}"<#rt/> + id="${parameters.id}"<#rt/> <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#else> class="errorMessage"<#rt/> <#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> > <#list actionErrors as error> <#if error??> -
  • <#if parameters.escape>${error!?html}<#else>${error!}<#rt/>
    • <#rt/> +
  • <#if parameters.escape>${error!}<#else>${error!?no_esc}<#rt/>
    • <#rt/> diff --git a/core/src/main/resources/template/simple/actionmessage.ftl b/core/src/main/resources/template/simple/actionmessage.ftl index 3643654ba..a0f14110d 100644 --- a/core/src/main/resources/template/simple/actionmessage.ftl +++ b/core/src/main/resources/template/simple/actionmessage.ftl @@ -21,20 +21,20 @@ <#if (actionMessages?? && actionMessages?size > 0 && !parameters.isEmptyList)> <#if parameters.id??> - id="${parameters.id?html}"<#rt/> + id="${parameters.id}"<#rt/> <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#else> class="actionMessage"<#rt/> <#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> > <#list actionMessages as message> <#if message??> -
  • <#if parameters.escape>${message!?html}<#else>${message!}
    • +
  • <#if parameters.escape>${message!}<#else>${message!?no_esc}
    • diff --git a/core/src/main/resources/template/simple/checkbox.ftl b/core/src/main/resources/template/simple/checkbox.ftl index 9be833775..54507d90a 100644 --- a/core/src/main/resources/template/simple/checkbox.ftl +++ b/core/src/main/resources/template/simple/checkbox.ftl @@ -18,7 +18,7 @@ * under the License. */ --> - + <#if parameters.nameValue?? && parameters.nameValue> checked="checked"<#rt/> @@ -26,21 +26,21 @@ disabled="disabled"<#rt/> <#if parameters.tabindex?has_content> - tabindex="${parameters.tabindex?html}"<#rt/> + tabindex="${parameters.tabindex}"<#rt/> <#if parameters.id?has_content> - id="${parameters.id?html}"<#rt/> + id="${parameters.id}"<#rt/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> <#if parameters.title?has_content> - title="${parameters.title?html}"<#rt/> + title="${parameters.title}"<#rt/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> /> <#if parameters.submitUnchecked!false> - + <#if parameters.disabled!false> disabled="disabled"<#rt/> diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl index 0018b811b..3fa27f189 100644 --- a/core/src/main/resources/template/simple/checkboxlist.ftl +++ b/core/src/main/resources/template/simple/checkboxlist.ftl @@ -59,11 +59,11 @@ <#assign itemTitle = ''/> - + <#if parameters.id?has_content> - id="${parameters.id?html}-${itemCount}"<#rt/> + id="${parameters.id}-${itemCount}"<#rt/> <#else> - id="${parameters.name?html}-${itemCount}"<#rt/> + id="${parameters.name}-${itemCount}"<#rt/> <#if tag.contains(parameters.nameValue, itemKey)> checked="checked"<#rt/> @@ -72,24 +72,24 @@ disabled="disabled"<#rt/> <#if itemCssClass??> - class="${itemCssClass?html}"<#rt/> + class="${itemCssClass}"<#rt/> <#else> <#if parameters.cssClass?has_content> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#if itemCssStyle??> - style="${itemCssStyle?html}"<#rt/> + style="${itemCssStyle}"<#rt/> <#else> <#if parameters.cssStyle?has_content> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> <#if itemTitle??> - title="${itemTitle?html}"<#rt/> + title="${itemTitle}"<#rt/> <#else> <#if parameters.title?has_content> - title="${parameters.title?html}"<#rt/> + title="${parameters.title}"<#rt/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> @@ -99,16 +99,16 @@ /> <#if parameters.id?has_content> - for="${parameters.id?html}-${itemCount}"<#rt/> + for="${parameters.id}-${itemCount}"<#rt/> <#else> - for="${parameters.name?html}-${itemCount}"<#rt/> + for="${parameters.name}-${itemCount}"<#rt/> - class="checkboxLabel">${itemValue?html} + class="checkboxLabel">${itemValue} <#else>   - <#if parameters.disabled!false> disabled="disabled"<#rt/> diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl index 3d953c5e3..1a6d80504 100644 --- a/core/src/main/resources/template/simple/combobox.ftl +++ b/core/src/main/resources/template/simple/combobox.ftl @@ -19,9 +19,9 @@ */ --> <#include "/${parameters.templateDir}/simple/text.ftl" />
    <#if parameters.list??> - <#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> <#if parameters.disabled!false> disabled="disabled"<#rt/> > <#if (parameters.headerKey?? && parameters.headerValue??)> - + <#if parameters.emptyOption!false> @@ -80,21 +80,21 @@ <#assign itemTitle = ''/> - <#lt/> diff --git a/core/src/main/resources/template/simple/common-attributes.ftl b/core/src/main/resources/template/simple/common-attributes.ftl index 9c96fbb1c..d68c0886b 100644 --- a/core/src/main/resources/template/simple/common-attributes.ftl +++ b/core/src/main/resources/template/simple/common-attributes.ftl @@ -19,5 +19,5 @@ */ --> <#if parameters.accesskey?has_content> - accesskey="${parameters.accesskey?html}" + accesskey="${parameters.accesskey}" \ No newline at end of file diff --git a/core/src/main/resources/template/simple/css.ftl b/core/src/main/resources/template/simple/css.ftl index f1f07b64f..9980c737b 100644 --- a/core/src/main/resources/template/simple/css.ftl +++ b/core/src/main/resources/template/simple/css.ftl @@ -20,14 +20,14 @@ --> <#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> <#if parameters.cssClass?has_content && !(hasFieldErrors && parameters.cssErrorClass??)> - class="${parameters.cssClass?html}"<#rt/> + class="${parameters.cssClass}"<#rt/> <#elseif parameters.cssClass?has_content && (hasFieldErrors && parameters.cssErrorClass??)> - class="${parameters.cssClass?html} ${parameters.cssErrorClass?html}"<#rt/> + class="${parameters.cssClass} ${parameters.cssErrorClass}"<#rt/> <#elseif !(parameters.cssClass?has_content) && (hasFieldErrors && parameters.cssErrorClass??)> - class="${parameters.cssErrorClass?html}"<#rt/> + class="${parameters.cssErrorClass}"<#rt/> <#if parameters.cssStyle?has_content && !(hasFieldErrors && (parameters.cssErrorStyle?? || parameters.cssErrorClass??))> - style="${parameters.cssStyle?html}"<#rt/> + style="${parameters.cssStyle}"<#rt/> <#elseif hasFieldErrors && parameters.cssErrorStyle??> - style="${parameters.cssErrorStyle?html}"<#rt/> + style="${parameters.cssErrorStyle}"<#rt/> \ No newline at end of file diff --git a/core/src/main/resources/template/simple/debug.ftl b/core/src/main/resources/template/simple/debug.ftl index c331d50fe..7f007a78f 100644 --- a/core/src/main/resources/template/simple/debug.ftl +++ b/core/src/main/resources/template/simple/debug.ftl @@ -42,8 +42,8 @@
    -[Debug] -