diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-03 11:24:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-03 11:24:55 +0100 |
| commit | 12b83f1a0d1e666b8dc629358a904613b23aac11 (patch) | |
| tree | 78f7cef9678e1e6d12f72d8de988443c8a72fb5a /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Enforce ascii filenames for uploads (diff) | |
| download | synapse-12b83f1a0d1e666b8dc629358a904613b23aac11.tar.xz | |
If user supplies filename in URL when downloading from media repo, use that name in Content Disposition
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 1dadd880b2..4a9b6d8eeb 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -36,7 +36,7 @@ class ThumbnailResource(BaseMediaResource): @request_handler @defer.inlineCallbacks def _async_render_GET(self, request): - server_name, media_id = parse_media_id(request) + server_name, media_id, _ = parse_media_id(request) width = parse_integer(request, "width") height = parse_integer(request, "height") method = parse_string(request, "method", "scale") |