diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-13 17:26:59 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-13 17:26:59 +0000 |
| commit | 4fbe6ca4010f804d784e16255fe4c63b7f607c52 (patch) | |
| tree | 6a483ad84dae70964241b918b98d2525038f2fb2 /synapse/rest/media | |
| parent | Merge branch 'develop' into paul/tiny-fixes (diff) | |
| parent | Merge pull request #374 from matrix-org/daniel/guestleave (diff) | |
| download | synapse-4fbe6ca4010f804d784e16255fe4c63b7f607c52.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to '')
| -rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index c28dc86cd7..e4fa8c4647 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, _, _ = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index 6abaf56b25..7d61596082 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -70,7 +70,7 @@ class UploadResource(BaseMediaResource): @request_handler @defer.inlineCallbacks def _async_render_POST(self, request): - auth_user, _ = yield self.auth.get_user_by_req(request) + auth_user, _, _ = yield self.auth.get_user_by_req(request) # TODO: The checks here are a bit late. The content will have # already been uploaded to a tmp file at this point content_length = request.getHeader("Content-Length") |