Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4391 reverts changes as this breaks WW-4420

Browse Source
This commit is contained in:
Lukasz Lenart
2014-11-17 11:39:38 +01:00
parent 77c76dc691
commit e1025a207d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+1 -4
View File
@@ -343,10 +343,7 @@ public class FreemarkerResult extends StrutsResultSupport {
contentType = "text/html";
}
String encoding = response.getCharacterEncoding();
if(encoding == null) {
encoding = template.getEncoding();
}
String encoding = template.getEncoding();
if (encoding != null) {
contentType = contentType + "; charset=" + encoding;