diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
| commit | 84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887 (patch) | |
| tree | 0475ae5759bd17bc76780a7f376e8a7bd900a430 /synapse/rest/client/v1/initial_sync.py | |
| parent | Split up replication_layer module into client, server and transaction queue (diff) | |
| parent | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff) | |
| download | synapse-84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887.tar.xz | |
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
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 357fa845b4..4a259bba64 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, client = yield self.auth.get_user_by_req(request) with_feedback = "feedback" in request.args as_client_event = "raw" not in request.args pagination_config = PaginationConfig.from_request(request) |