diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-06-02 13:29:48 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-06-02 13:29:48 +0100 |
| commit | f84b89f0c6b2e67897fec8639b79bf1d45c8f2b6 (patch) | |
| tree | d6bf5911a1908167a42de9a53db1b7b07cf9476a /synapse/push/mailer.py | |
| parent | Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none (diff) | |
| download | synapse-f84b89f0c6b2e67897fec8639b79bf1d45c8f2b6.tar.xz | |
if an email pusher specifies a brand param, use it
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index fe5d67a03c..0e9d8ccb53 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -78,12 +78,12 @@ ALLOWED_ATTRS = { class Mailer(object): - def __init__(self, hs): + def __init__(self, hs, app_name): self.hs = hs self.store = self.hs.get_datastore() self.state_handler = self.hs.get_state_handler() loader = jinja2.FileSystemLoader(self.hs.config.email_template_dir) - self.app_name = self.hs.config.email_app_name + self.app_name = app_name env = jinja2.Environment(loader=loader) env.filters["format_ts"] = format_ts_filter env.filters["mxc_to_http"] = self.mxc_to_http_filter |