diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
| commit | 056f0991262902e22f0414e17c01198e1606384a (patch) | |
| tree | fa365dc1aef28f86499122d8b9176c03dd95e863 /synapse/push/mailer.py | |
| parent | Batch process handling state groups (diff) | |
| parent | Fix manhole on py3 (pt 2) (#4067) (diff) | |
| download | synapse-056f0991262902e22f0414e17c01198e1606384a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 1a5a10d974..b9dcfee740 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -528,7 +528,10 @@ def load_jinja2_templates(config): """ logger.info("loading jinja2") - loader = jinja2.FileSystemLoader(config.email_template_dir) + if config.email_template_dir: + loader = jinja2.FileSystemLoader(config.email_template_dir) + else: + loader = jinja2.PackageLoader('synapse', 'res/templates') env = jinja2.Environment(loader=loader) env.filters["format_ts"] = format_ts_filter env.filters["mxc_to_http"] = _create_mxc_to_http_filter(config) |