inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alan Davis
2015-08-08 08:02:04 +00:00
parent ce73f63b14
commit 2e0d70656b
1 changed files with 3 additions and 0 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

@@ -40,6 +40,7 @@ import org.springframework.extensions.webscripts.WebScriptException;
import freemarker.cache.MultiTemplateLoader; import freemarker.cache.MultiTemplateLoader;
import freemarker.cache.StrongCacheStorage; import freemarker.cache.StrongCacheStorage;
import freemarker.cache.TemplateLoader; import freemarker.cache.TemplateLoader;
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;
@@ -199,6 +200,8 @@ public class RepositoryTemplateProcessor extends FreeMarkerProcessor
// set output encoding // set output encoding
config.setOutputEncoding("UTF-8"); config.setOutputEncoding("UTF-8");
config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
templateConfig = config; templateConfig = config;
} }