summary refs log tree commit diff
path: root/synapse/handlers/account_validity.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-16 11:32:23 +0000
committerGitHub <noreply@github.com>2020-03-16 11:32:23 +0000
commit21c9e4d054b57cbff6dcffe4ef0796a38a6084cb (patch)
tree9768a4d4d2f3a4daa21657053551c5b02ce2b999 /synapse/handlers/account_validity.py
parentFix resetting password via a phone number (#21) (diff)
downloadsynapse-21c9e4d054b57cbff6dcffe4ef0796a38a6084cb.tar.xz
Fix buggy condition in account validity handler (#28)
Diffstat (limited to 'synapse/handlers/account_validity.py')
-rw-r--r--synapse/handlers/account_validity.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py

index 947237d7da..51507bde61 100644 --- a/synapse/handlers/account_validity.py +++ b/synapse/handlers/account_validity.py
@@ -45,7 +45,11 @@ class AccountValidityHandler(object): self._show_users_in_user_directory = self.hs.config.show_users_in_user_directory self.profile_handler = self.hs.get_profile_handler() - 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