summary refs log tree commit diff
path: root/synapse/handlers/pagination.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-31 15:06:16 +0000
committerErik Johnston <erik@matrix.org>2020-01-31 15:06:16 +0000
commitc854d255e50a72f9518e7a844f01e8c9ec00d943 (patch)
tree5813368d63ce4342df006bf2ef659b4b7ee28138 /synapse/handlers/pagination.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentFix deleting of stale marker for device lists (#6819) (diff)
downloadsynapse-c854d255e50a72f9518e7a844f01e8c9ec00d943.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/pagination.py')
-rw-r--r--synapse/handlers/pagination.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py

index 71d76202c9..caf841a643 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py
@@ -281,7 +281,7 @@ class PaginationHandler(object): """Purge the given room from the database""" with (await self.pagination_lock.write(room_id)): # check we know about the room - await self.store.get_room_version(room_id) + await self.store.get_room_version_id(room_id) # first check that we have no users in this room joined = await defer.maybeDeferred(