summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
commit51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a (patch)
treea44a6260e7b7f5622785d615a46184e19d21d2ca /synapse/handlers
parentMerge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a.tar.xz
Merge branch 'hotfixes-v0.9.0-r5' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index cfa2e38ed2..3da08c147e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -531,9 +531,7 @@ class RoomListHandler(BaseHandler):
         chunk = yield self.store.get_rooms(is_public=True)
         results = yield defer.gatherResults(
             [
-                self.store.get_users_in_room(
-                    room_id=room["room_id"],
-                )
+                self.store.get_users_in_room(room["room_id"])
                 for room in chunk
             ],
             consumeErrors=True,