Merge pull request #5463 from matrix-org/babolivier/account_validity_deactivated_accounts_2

Port "Don't send renewal emails to deactivated users" to dinsic

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py

index 261446517d..5e0b92eb1c 100644
--- a/synapse/handlers/account_validity.py
+++ b/synapse/handlers/account_validity.py
@@ -110,6 +110,9 @@ class AccountValidityHandler(object):
         # Stop right here if the user doesn't have at least one email address.
         # In this case, they will have to ask their server admin to renew their
         # account manually.
+        # We don't need to do a specific check to make sure the account isn't
+        # deactivated, as a deactivated account isn't supposed to have any
+        # email address attached to it.
         if not addresses:
             return