summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-12-22 18:25:04 +0000
committerDavid Baker <dave@matrix.org>2015-12-22 18:25:04 +0000
commitd2a92c6bdeff51136a930ccddda6e734a2a0dc25 (patch)
tree8c0bebe7b678f2ba5e631f34c328c25097185228 /synapse/handlers
parentAdd mocks to make tests work again (diff)
downloadsynapse-d2a92c6bdeff51136a930ccddda6e734a2a0dc25.tar.xz
Fix merge fail with anon access stuff
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index b1bfdce85b..f63c073a20 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -520,11 +520,11 @@ class SyncHandler(BaseHandler):
         # this users current read receipt. This could almost certainly be
         # optimised.
         _, all_ephemeral_by_room = yield self.ephemeral_by_room(
-            sync_config, now_token
+            sync_config, now_token, room_ids
         )
 
         now_token, ephemeral_by_room = yield self.ephemeral_by_room(
-            sync_config, now_token, since_token
+            sync_config, now_token, room_ids, since_token
         )
 
         rm_handler = self.hs.get_handlers().room_member_handler