diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-24 15:30:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 15:30:10 +0100 |
| commit | 25433f212d6703c62e699f9ba3f9a385b1f5bd62 (patch) | |
| tree | 7e11f6a8ea930989b08baf6f499e5fc3035ca979 /synapse/handlers | |
| parent | Merge pull request #5516 from matrix-org/rav/acme_key_path (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-25433f212d6703c62e699f9ba3f9a385b1f5bd62.tar.xz | |
Merge pull request #5531 from matrix-org/erikj/workers_pagination_token
Fix /messages on workers when no from param specified.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/pagination.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 062e026e5f..76ee97ddd3 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -180,9 +180,7 @@ class PaginationHandler(object): room_token = pagin_config.from_token.room_key else: pagin_config.from_token = ( - yield self.hs.get_event_sources().get_current_token_for_room( - room_id=room_id - ) + yield self.hs.get_event_sources().get_current_token_for_pagination() ) room_token = pagin_config.from_token.room_key |