diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-02 13:53:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-02 13:53:30 +0000 |
| commit | 0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3 (patch) | |
| tree | 25ca81b14a72192a89c9399b3d80180ac124ca14 /synapse/handlers/events.py | |
| parent | Must update pending_transactions map before yield'ing (diff) | |
| parent | Merge pull request #83 from matrix-org/nofile_limit_config (diff) | |
| download | synapse-0a036944bd2f0b42195b1984ff0ad2b6ff3d50f3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 025e7e7e62..8d5f5c8499 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -69,9 +69,6 @@ class EventStreamHandler(BaseHandler): ) self._streams_per_user[auth_user] += 1 - if pagin_config.from_token is None: - pagin_config.from_token = None - rm_handler = self.hs.get_handlers().room_member_handler room_ids = yield rm_handler.get_rooms_for_user(auth_user) |