diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 11:37:47 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 11:37:47 +0000 |
| commit | 7ed8a68815355378bf5f11ff7e9bc11f6f047947 (patch) | |
| tree | b63277048cd2bacb059b9dfb4f5e6a4f56bac98b /synapse/config/registration.py | |
| parent | Add more logging around message retention policies support (#6717) (diff) | |
| parent | Fix empty account_validity config block (#6747) (diff) | |
| download | synapse-7ed8a68815355378bf5f11ff7e9bc11f6f047947.tar.xz | |
Fix empty account_validity config block (#6747)
* commit 'e9e066055': Update changelog.d/6747.bugfix Revert "Newsfile" Newsfile Add changelog Fix empty account_validity config block
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index cbb5155a50..7dba213d74 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -29,6 +29,7 @@ class AccountValidityConfig(Config): def __init__(self, config, synapse_config): if config is None: return + super(AccountValidityConfig, self).__init__() self.enabled = config.get("enabled", False) self.renew_by_email_enabled = "renew_at" in config @@ -93,7 +94,7 @@ class RegistrationConfig(Config): ) self.account_validity = AccountValidityConfig( - config.get("account_validity", {}), config + config.get("account_validity") or {}, config ) self.registrations_require_3pid = config.get("registrations_require_3pid", []) |