diff options
| author | Richard van der Hoff <richard@matrix.org> | 2022-07-29 15:15:21 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2022-07-29 15:15:21 +0100 |
| commit | d548d8f18d23d2327c5dd3b4c79d74e900995201 (patch) | |
| tree | 36401cab940a052c58da5747fa34e083ea98e7ec /synapse/app/homeserver.py | |
| parent | Explicitly mention which resources support compression in the config guide (#... (diff) | |
| parent | update changelog (diff) | |
| download | synapse-d548d8f18d23d2327c5dd3b4c79d74e900995201.tar.xz | |
Merge tag 'v1.64.0rc2' into develop
Synapse 1.64.0rc2 (2022-07-29) ============================== This RC reintroduces support for `account_threepid_delegates.email`, which was removed in 1.64.0rc1. It remains deprecated and will be removed altogether in a future release. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 6bafa7d3f3..745e704141 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -44,6 +44,7 @@ from synapse.app._base import ( register_start, ) from synapse.config._base import ConfigError, format_config_error +from synapse.config.emailconfig import ThreepidBehaviour from synapse.config.homeserver import HomeServerConfig from synapse.config.server import ListenerConfig from synapse.federation.transport.server import TransportLayerServer @@ -201,7 +202,7 @@ class SynapseHomeServer(HomeServer): } ) - if self.config.email.can_verify_email: + if self.config.email.threepid_behaviour_email == ThreepidBehaviour.LOCAL: from synapse.rest.synapse.client.password_reset import ( PasswordResetSubmitTokenResource, ) |