mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-26 19:47:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge fail with anon access stuff

Browse source
This commit is contained in:
David Baker 2015-12-22 18:25:04 +00:00
parent d79e90f078
commit d2a92c6bde
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/handlers/sync.py
View file

@ -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