Merge branch 'dinsic_anoa/info_split' of github.com:matrix-org/synapse into dinsic_anoa/info_split

This commit is contained in:
Andrew Morgan 2019-02-27 15:23:19 +00:00
commit 0a23bf442f

View file

@ -51,7 +51,7 @@ def check_3pid_allowed(hs, medium, address):
if data['hs'] != hs.config.server_name and data['shadow_hs'] != hs.config.server_name: if data['hs'] != hs.config.server_name and data['shadow_hs'] != hs.config.server_name:
defer.returnValue(False) defer.returnValue(False)
if data.get('requires_invite', False) and data.get('invited', False) == False: if data.get('requires_invite', False) and not data.get('invited', False):
# Requires an invite but hasn't been invited # Requires an invite but hasn't been invited
defer.returnValue(False) defer.returnValue(False)