diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
| commit | 57eacee4f4cff3a663a6e22834a82f9c5783a56d (patch) | |
| tree | b5714f78b8c129ad8aca1689e2d7ddecb20c3bed /synapse/config/registration.py | |
| parent | Changelog (diff) | |
| parent | Update ModuleApi to avoid register(generate_token=True) (#5640) (diff) | |
| download | synapse-57eacee4f4cff3a663a6e22834a82f9c5783a56d.tar.xz | |
Merge branch 'develop' into babolivier/invite-json
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 4a59e6ec90..b895c4e9f4 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -71,9 +71,8 @@ class RegistrationConfig(Config): self.default_identity_server = config.get("default_identity_server") self.allow_guest_access = config.get("allow_guest_access", False) - self.invite_3pid_guest = self.allow_guest_access and config.get( - "invite_3pid_guest", False - ) + if config.get("invite_3pid_guest", False): + raise ConfigError("invite_3pid_guest is no longer supported") self.auto_join_rooms = config.get("auto_join_rooms", []) for room_alias in self.auto_join_rooms: |