summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-09-24 17:00:33 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-09-24 17:00:33 +0100
commitc77c4a2fcdcbb6dd741325bb2e522bc93e4291e2 (patch)
treeab21a3d4e3d9156eb9d080707754de0ebd06fee1 /synapse/config/_base.py
parentFix MultiWriteIdGenerator's handling of restarts. (#8374) (diff)
parents/URLs/variables in changelog (diff)
downloadsynapse-c77c4a2fcdcbb6dd741325bb2e522bc93e4291e2.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index bb9bf8598d..05a66841c3 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -194,7 +194,10 @@ class Config:
             return file_stream.read()
 
     def read_templates(
-        self, filenames: List[str], custom_template_directory: Optional[str] = None,
+        self,
+        filenames: List[str],
+        custom_template_directory: Optional[str] = None,
+        autoescape: bool = False,
     ) -> List[jinja2.Template]:
         """Load a list of template files from disk using the given variables.
 
@@ -210,6 +213,9 @@ class Config:
             custom_template_directory: A directory to try to look for the templates
                 before using the default Synapse template directory instead.
 
+            autoescape: Whether to autoescape variables before inserting them into the
+                template.
+
         Raises:
             ConfigError: if the file's path is incorrect or otherwise cannot be read.
 
@@ -233,7 +239,7 @@ class Config:
             search_directories.insert(0, custom_template_directory)
 
         loader = jinja2.FileSystemLoader(search_directories)
-        env = jinja2.Environment(loader=loader, autoescape=True)
+        env = jinja2.Environment(loader=loader, autoescape=autoescape)
 
         # Update the environment with our custom filters
         env.filters.update(