Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Encode based on response character encoding

Browse Source 
Before this commit, characters were always encoded with the default
encoding (i.e. ISO-8859-1). Now, the character encoding of the response
is used.

Closes gh-files
This commit is contained in:
Arjen Poutsma
2024-06-19 11:14:27 +02:00
parent c72e31bcf5
commit e62255512a
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
View File

@@ -92,7 +92,8 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
* as required. This version is <strong>not</strong> {@link PropertyEditor}-aware.
*/
protected String getDisplayString(@Nullable Object value) {
return ValueFormatter.getDisplayString(value, isHtmlEscape());
String displayString = ValueFormatter.getDisplayString(value, false);
return isHtmlEscape() ? htmlEscape(displayString) : displayString;
}
/**
@@ -102,7 +103,8 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
* to obtain the display value.
*/
protected String getDisplayString(@Nullable Object value, @Nullable PropertyEditor propertyEditor) {
return ValueFormatter.getDisplayString(value, propertyEditor, isHtmlEscape());
String displayString = ValueFormatter.getDisplayString(value, propertyEditor, false);
return isHtmlEscape() ? htmlEscape(displayString) : displayString;
}
/**