summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-01 15:59:12 +0000
committerErik Johnston <erik@matrix.org>2016-02-01 15:59:12 +0000
commit1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f (patch)
tree2655f4c8f789d5e68448b9239a56e4cac7c209fc /synapse/storage
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/sync (diff)
parentMerge pull request #543 from matrix-org/erikj/sync (diff)
downloadsynapse-1ef7cae41b4984f84591a19b0d38f03cfcb1ff0f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/stream.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index cc9e623608..8dc8f5c640 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -323,11 +323,6 @@ class StreamStore(SQLBaseStore):
                 " WHERE m.user_id = ? AND m.membership = 'join'"
             )
             current_room_membership_args = [user_id]
-            if room_ids:
-                current_room_membership_sql += " AND m.room_id in (%s)" % (
-                    ",".join(map(lambda _: "?", room_ids))
-                )
-                current_room_membership_args = [user_id] + room_ids
 
         # We also want to get any membership events about that user, e.g.
         # invites or leave notifications.