summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-01-20 12:30:41 +0000
committerGitHub <noreply@github.com>2021-01-20 12:30:41 +0000
commitfa50e4bf4ddcb8e98d44700513a28c490f80f02b (patch)
tree2f2647326c36624c91c5aaf8a350d6fba47a541a /synapse/config/_base.py
parentUse the account handler in additional places. (#9166) (diff)
downloadsynapse-fa50e4bf4ddcb8e98d44700513a28c490f80f02b.tar.xz
Give `public_baseurl` a default value (#9159)
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 2931a88207..94144efc87 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -252,11 +252,12 @@ class Config:
         env = jinja2.Environment(loader=loader, autoescape=autoescape)
 
         # Update the environment with our custom filters
-        env.filters.update({"format_ts": _format_ts_filter})
-        if self.public_baseurl:
-            env.filters.update(
-                {"mxc_to_http": _create_mxc_to_http_filter(self.public_baseurl)}
-            )
+        env.filters.update(
+            {
+                "format_ts": _format_ts_filter,
+                "mxc_to_http": _create_mxc_to_http_filter(self.public_baseurl),
+            }
+        )
 
         for filename in filenames:
             # Load the template