Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix missing app variable in mail subject #11745

Merged
merged 4 commits into from
Jan 13, 2022
Merged

Fix missing app variable in mail subject #11745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ccb8d4
fix missing app variable in mail subject
br4nnigan Jan 9, 2022
627ae04
Run linters
Jan 13, 2022
5b47b3f
Changelog
Jan 13, 2022
4cd6444
Changelog
Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11710.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions changelog.d/11745.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions synapse/push/mailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ async def send_registration_mail(
await self.send_email(
email_address,
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,
)

Expand Down Expand Up @@ -209,7 +209,7 @@ async def send_add_threepid_mail(
await self.send_email(
email_address,
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,
)

Expand Down