summary refs log tree commit diff
path: root/synapse/event_auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
committerErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
commit9f2d14ee267348ee0c62565ec51b4263feab26c2 (patch)
tree6fb9f28a419a1c45589802fd83ea1983dd6dee04 /synapse/event_auth.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4089 from dekonnection/master (diff)
downloadsynapse-9f2d14ee267348ee0c62565ec51b4263feab26c2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/event_auth.py')
-rw-r--r--synapse/event_auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py

index af3eee95b9..d4d4474847 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py
@@ -690,7 +690,7 @@ def auth_types_for_event(event): auth_types = [] auth_types.append((EventTypes.PowerLevels, "", )) - auth_types.append((EventTypes.Member, event.user_id, )) + auth_types.append((EventTypes.Member, event.sender, )) auth_types.append((EventTypes.Create, "", )) if event.type == EventTypes.Member: