summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-27 15:23:19 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-27 15:23:19 +0000
commit0a23bf442f2936d71f7ad033b12c565aa65e3b4a (patch)
tree6af5e1939386b71fbf2842061468d89569059bdb
parentCheck shadow_hs as well as hs during 3pid reg (diff)
parentUpdate synapse/util/threepids.py (diff)
downloadsynapse-0a23bf442f2936d71f7ad033b12c565aa65e3b4a.tar.xz
Merge branch 'dinsic_anoa/info_split' of github.com:matrix-org/synapse into dinsic_anoa/info_split
-rw-r--r--synapse/util/threepids.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/threepids.py b/synapse/util/threepids.py

index 1db0a01e27..84c56109ca 100644 --- a/synapse/util/threepids.py +++ b/synapse/util/threepids.py
@@ -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: 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 defer.returnValue(False)