summary refs log tree commit diff
path: root/synapse/storage/stream.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-04 17:31:01 +0000
commit4e62ffdb21c17817a56c1d864d1f8dc91131b8ef (patch)
tree21928f0803225e707532b477f581c6f4f1885ac9 /synapse/storage/stream.py
parentAllow guests to register and call /events?room_id= (diff)
parentMerge pull request #339 from matrix-org/daniel/removesomelies (diff)
downloadsynapse-4e62ffdb21c17817a56c1d864d1f8dc91131b8ef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r--synapse/storage/stream.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 15d4c2bf68..c728013f4c 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -158,8 +158,7 @@ class StreamStore(SQLBaseStore):
         defer.returnValue(results)
 
     @log_function
-    def get_room_events_stream(self, user_id, from_key, to_key, room_id,
-                               limit=0):
+    def get_room_events_stream(self, user_id, from_key, to_key, limit=0):
         current_room_membership_sql = (
             "SELECT m.room_id FROM room_memberships as m "
             " INNER JOIN current_state_events as c"