inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)

Browse Source 
110087: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110048: MNT-14554 : 5.0.2 - Node-Details
         - added incompatible_improvements setting to version 2.3.20 to all FreeMarker Configurations
         - this will tell free marker to escape all ?html as ?xhtml
         - added more validation code: ?html to alfresco-macros.lib.ftl   


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-08-17 11:45:13 +00:00
parent 53be190854
commit 19b307357f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
View File

@@ -44,6 +44,7 @@ import freemarker.core.TemplateClassResolver;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
import freemarker.template.TemplateExceptionHandler; import freemarker.template.TemplateExceptionHandler;
import freemarker.template.Version;
/** /**
@@ -199,7 +200,7 @@ public class RepositoryTemplateProcessor extends FreeMarkerProcessor
// set output encoding // set output encoding
config.setOutputEncoding("UTF-8"); config.setOutputEncoding("UTF-8");
config.setIncompatibleImprovements(new Version(2, 3, 20));
config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER); config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
templateConfig = config; templateConfig = config;