summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 13:12:35 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 13:12:35 +0000
commit8c6012a4af4973b0a53af65a31cbdb92a3dec5a2 (patch)
treec43d86def63ed5b084dfb63b626bf39dc2d4cdd0 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/sync (diff)
downloadsynapse-8c6012a4af4973b0a53af65a31cbdb92a3dec5a2.tar.xz
Fix tests
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/filtering.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py

index 116060ee7f..6c13ada5df 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py
@@ -193,7 +193,7 @@ class Filter(object): sender = event.get("sender", None) if not sender: # Presence events have their 'sender' in content.user_id - sender = event.get("conntent", {}).get("user_id", None) + sender = event.get("content", {}).get("user_id", None) return self.check_fields( event.get("room_id", None),