diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
| commit | 6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch) | |
| tree | c0e82ece8dd47bdd3d0d142953d8b494c0b40023 /synapse/config/_base.py | |
| parent | Reword confusing sentence in CHANGES. (diff) | |
| parent | Give `public_baseurl` a default value (#9159) (diff) | |
| download | synapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz | |
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 11 |
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 |