Fix buggy condition in account validity handler (matrix-org#7074)

phil-flex · Mar 27, 2020 · e979b3d · e979b3d
1 parent 2894641
commit e979b3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/7074.bugfix b/changelog.d/7074.bugfix
@@ -0,0 +1 @@
+Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases.
diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py
@@ -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
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.