summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-30 11:15:37 +0000
committerMark Haines <mark.haines@matrix.org>2015-10-30 11:15:37 +0000
commitd58edd98e91ad041a31a96980002c2d8899a2580 (patch)
tree03799a7b282f13a68e8c9f6e53524594667ac77e /synapse/handlers
parentDon't mark newly joined room timelines as limited in an incremental sync (diff)
downloadsynapse-d58edd98e91ad041a31a96980002c2d8899a2580.tar.xz
Update the other place check_joined_room is called
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 04f2d46d15..4c5a2353b2 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -520,7 +520,7 @@ class SyncHandler(BaseHandler):
             current_state=current_state_events,
         )
 
-        state_events_delta = yield self.check_joined_room(
+        state_events_delta, _ = yield self.check_joined_room(
             sync_config, room_id, state_events_delta
         )