diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:36:21 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:43:41 +0000 |
| commit | c59bcabf0b5c0ab78c0f89da75b031993c4660d9 (patch) | |
| tree | 5691f2b6cc16fb0435c78925004bc12392fa3a42 /synapse/rest/media/v0 | |
| parent | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff) | |
| download | synapse-c59bcabf0b5c0ab78c0f89da75b031993c4660d9.tar.xz | |
Return the device_id from get_auth_by_req
Diffstat (limited to 'synapse/rest/media/v0')
| -rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index 79ae0e3d74..311ab89edb 100644 --- a/synapse/rest/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -66,7 +66,7 @@ class ContentRepoResource(resource.Resource): @defer.inlineCallbacks def map_request_to_name(self, request): # auth the user - auth_user = yield self.auth.get_user_by_req(request) + auth_user, device_id = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( |