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

Fix buggy condition in account validity handler #7074

Merged
merged 2 commits into from
Mar 16, 2020
Merged

Fix buggy condition in account validity handler #7074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42dfbe1
Fix buggy condition in account validity handler
babolivier Mar 13, 2020
c43b12a
Changelog
babolivier Mar 13, 2020
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/7074.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases.
6 changes: 5 additions & 1 deletion synapse/handlers/account_validity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ def __init__(self, hs):

self._account_validity = self.hs.config.account_validity

if self._account_validity.renew_by_email_enabled and load_jinja2_templates:
if (
self._account_validity.enabled
and self._account_validity.renew_by_email_enabled
and load_jinja2_templates
):
# Don't do email-specific configuration if renewal by email is disabled.
try:
app_name = self.hs.config.email_app_name
Expand Down