diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
| commit | 812b5de0feeb905643faf4decff3d7b566d3dbe9 (patch) | |
| tree | 70c5d4a2dab2e35bc39711392cba52e22e5a145f /synapse/push/mailer.py | |
| parent | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe (diff) | |
| parent | Fix setting the _clock in SQLBaseStore (diff) | |
| download | synapse-812b5de0feeb905643faf4decff3d7b566d3dbe9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
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 b96cab5ef8..b172aca1d2 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -78,13 +78,13 @@ 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.handlers = self.hs.get_handlers() 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 |