diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
commit | 729ea933ea4a02430002d5055483c3ea34538578 (patch) | |
tree | 2064ec885655d444c4d155b1132f845176b36ec4 /synapse/rest/client/v1/initial_sync.py | |
parent | Implement basic pagination for search results (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-729ea933ea4a02430002d5055483c3ea34538578.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/rest/client/v1/initial_sync.py')
-rw-r--r-- | synapse/rest/client/v1/initial_sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py index 52c7943400..856a70f297 100644 --- a/synapse/rest/client/v1/initial_sync.py +++ b/synapse/rest/client/v1/initial_sync.py @@ -25,7 +25,7 @@ class InitialSyncRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): - user, _ = yield self.auth.get_user_by_req(request) + user, _, _ = yield self.auth.get_user_by_req(request) as_client_event = "raw" not in request.args pagination_config = PaginationConfig.from_request(request) handler = self.handlers.message_handler |