MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-15 14:32:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing app variable in mail subject (#11745)

Browse source 
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:
David Robertson 2022-01-13 20:19:10 +00:00 committed by GitHub
parent 4ca8fcdd5a
commit d70169bf9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/11710.bugfix Normal file
View 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
View 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.

4
synapse/push/mailer.py
View file

@ -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,
) )