forked from MirrorHub/synapse
Fix missing app variable in mail subject (#11745)
documentation claims that you can use the %(app)s variable in password_reset and email_validation subjects, but if you do you end up with an error 500 Co-authored-by: br4nnigan <10244835+br4nnigan@users.noreply.github.com>
This commit is contained in:
parent
4ca8fcdd5a
commit
d70169bf9b
3 changed files with 4 additions and 2 deletions
1
changelog.d/11710.bugfix
Normal file
1
changelog.d/11710.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix a bug introduced in Synapse v1.18.0 where password reset and address validation emails would not be sent if their subject was configured to use the 'app' template variable. Contributed by @br4nnigan.
|
1
changelog.d/11745.bugfix
Normal file
1
changelog.d/11745.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix a bug introduced in Synapse v1.18.0 where password reset and address validation emails would not be sent if their subject was configured to use the 'app' template variable. Contributed by @br4nnigan.
|
|
@ -178,7 +178,7 @@ class Mailer:
|
||||||
await self.send_email(
|
await self.send_email(
|
||||||
email_address,
|
email_address,
|
||||||
self.email_subjects.email_validation
|
self.email_subjects.email_validation
|
||||||
% {"server_name": self.hs.config.server.server_name},
|
% {"server_name": self.hs.config.server.server_name, "app": self.app_name},
|
||||||
template_vars,
|
template_vars,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -209,7 +209,7 @@ class Mailer:
|
||||||
await self.send_email(
|
await self.send_email(
|
||||||
email_address,
|
email_address,
|
||||||
self.email_subjects.email_validation
|
self.email_subjects.email_validation
|
||||||
% {"server_name": self.hs.config.server.server_name},
|
% {"server_name": self.hs.config.server.server_name, "app": self.app_name},
|
||||||
template_vars,
|
template_vars,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue