summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-02 16:23:54 +0000
committerErik Johnston <erik@matrix.org>2016-02-02 16:23:54 +0000
commit43e13dbd4d22632a56903826df56cc8aa28be944 (patch)
tree96557786f18ba3f815553d3e4e34354135a7128c /synapse/handlers/room.py
parentMerge pull request #545 from matrix-org/erikj/sync (diff)
parents/get_room_changes_for_user/get_membership_changes_for_user/ (diff)
downloadsynapse-43e13dbd4d22632a56903826df56cc8aa28be944.tar.xz
Merge pull request #549 from matrix-org/erikj/sync
Fetch events in a separate transaction.
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 68e2c75a48..799221c198 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -1013,7 +1013,7 @@ class RoomEventSource(object): limit=limit, ) else: - room_events = yield self.store.get_room_changes_for_user( + room_events = yield self.store.get_membership_changes_for_user( user.to_string(), from_key, to_key )