From 2e0d70656bc7dae824fa7a8e10bd1488b5f30dbb Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 8 Aug 2015 08:02:04 +0000 Subject: [PATCH] Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) 109754: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3) 109744: MNT-14507: Freemarker template - added change for all freeMarker configs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/RepositoryTemplateProcessor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java index 3e0475f2af..f306475aa7 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java @@ -40,6 +40,7 @@ import org.springframework.extensions.webscripts.WebScriptException; import freemarker.cache.MultiTemplateLoader; import freemarker.cache.StrongCacheStorage; import freemarker.cache.TemplateLoader; +import freemarker.core.TemplateClassResolver; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateExceptionHandler; @@ -199,6 +200,8 @@ public class RepositoryTemplateProcessor extends FreeMarkerProcessor // set output encoding config.setOutputEncoding("UTF-8"); + config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER); + templateConfig = config; }