From 72a8868f844f7a15900497915cf507ad908fbce6 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Tue, 13 Jun 2017 14:21:09 +0200
Subject: [PATCH] FreeMarker macros based on HTML output format (requires
 FreeMarker 2.3.24+)

Issue: SPR-14740
---
 .../web/servlet/view/freemarker/spring.ftl    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl
index 00ef2e122d..418dda1ebb 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl
@@ -1,4 +1,4 @@
-<#ftl strip_whitespace=true>
+<#ftl output_format="HTML" strip_whitespace=true>
 <#--
  * spring.ftl
  *
@@ -157,7 +157,7 @@
  -->
 <#macro formInput path attributes="" fieldType="text">
     <@bind path/>
-    <input type="${fieldType}" id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" value="<#if fieldType!="password">${stringStatusValue}</#if>" ${attributes}<@closeTag/>
+    <input type="${fieldType}" id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" value="<#if fieldType!="password">${stringStatusValue}</#if>" ${attributes?no_esc}<@closeTag/>
 </#macro>
 
 <#--
@@ -202,7 +202,7 @@
  -->
 <#macro formTextarea path attributes="">
     <@bind path/>
-    <textarea id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes}>
+    <textarea id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes?no_esc}>
 ${stringStatusValue}</textarea>
 </#macro>
 
@@ -219,14 +219,14 @@ ${stringStatusValue}</textarea>
 -->
 <#macro formSingleSelect path options attributes="">
     <@bind path/>
-    <select id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes}>
+    <select id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes?no_esc}>
         <#if options?is_hash>
             <#list options?keys as value>
-            <option value="${value?html}"<@checkSelected value/>>${options[value]?html}</option>
+            <option value="${value}"<@checkSelected value/>>${options[value]}</option>
             </#list>
         <#else> 
             <#list options as value>
-            <option value="${value?html}"<@checkSelected value/>>${value?html}</option>
+            <option value="${value}"<@checkSelected value/>>${value}</option>
             </#list>
         </#if>
     </select>
@@ -245,10 +245,10 @@ ${stringStatusValue}</textarea>
 -->
 <#macro formMultiSelect path options attributes="">
     <@bind path/>
-    <select multiple="multiple" id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes}>
+    <select multiple="multiple" id="${status.expression?replace('[','')?replace(']','')}" name="${status.expression}" ${attributes?no_esc}>
         <#list options?keys as value>
         <#assign isSelected = contains(status.actualValue?default([""]), value)>
-        <option value="${value?html}"<#if isSelected> selected="selected"</#if>>${options[value]?html}</option>
+        <option value="${value}"<#if isSelected> selected="selected"</#if>>${options[value]}</option>
         </#list>
     </select>
 </#macro>
@@ -269,8 +269,8 @@ ${stringStatusValue}</textarea>
     <@bind path/>
     <#list options?keys as value>
     <#assign id="${status.expression?replace('[','')?replace(']','')}${value_index}">
-    <input type="radio" id="${id}" name="${status.expression}" value="${value?html}"<#if stringStatusValue == value> checked="checked"</#if> ${attributes}<@closeTag/>
-    <label for="${id}">${options[value]?html}</label>${separator}
+    <input type="radio" id="${id}" name="${status.expression}" value="${value}"<#if stringStatusValue == value> checked="checked"</#if> ${attributes?no_esc}<@closeTag/>
+    <label for="${id}">${options[value]}</label>${separator}
     </#list>
 </#macro>
 
@@ -291,8 +291,8 @@ ${stringStatusValue}</textarea>
     <#list options?keys as value>
     <#assign id="${status.expression?replace('[','')?replace(']','')}${value_index}">
     <#assign isSelected = contains(status.actualValue?default([""]), value)>
-    <input type="checkbox" id="${id}" name="${status.expression}" value="${value?html}"<#if isSelected> checked="checked"</#if> ${attributes}<@closeTag/>
-    <label for="${id}">${options[value]?html}</label>${separator}
+    <input type="checkbox" id="${id}" name="${status.expression}" value="${value}"<#if isSelected> checked="checked"</#if> ${attributes?no_esc}<@closeTag/>
+    <label for="${id}">${options[value]}</label>${separator}
     </#list>
     <input type="hidden" name="_${status.expression}" value="on"/>
 </#macro>
@@ -311,7 +311,7 @@ ${stringStatusValue}</textarea>
     <#assign id="${status.expression?replace('[','')?replace(']','')}">
     <#assign isSelected = status.value?? && status.value?string=="true">
 	<input type="hidden" name="_${status.expression}" value="on"/>
-	<input type="checkbox" id="${id}" name="${status.expression}"<#if isSelected> checked="checked"</#if> ${attributes}/>
+	<input type="checkbox" id="${id}" name="${status.expression}"<#if isSelected> checked="checked"</#if> ${attributes?no_esc}/>
 </#macro>
 
 <#--