diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-13 12:16:01 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-13 12:16:01 +0000 |
| commit | a9b712e9dce119c65fe24913d2a79212ae07a354 (patch) | |
| tree | 2c98b0b3d7d31c59ce41db257c3a18c5b3a2df03 /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Factor out common code for search insert (diff) | |
| parent | Merge pull request #2857 from matrix-org/erikj/upload_store (diff) | |
| download | synapse-a9b712e9dce119c65fe24913d2a79212ae07a354.tar.xz | |
Merge branch 'develop' into matthew/gin_work_mem
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 12e84a2b7c..58ada49711 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -164,7 +164,8 @@ class ThumbnailResource(Resource): # Okay, so we generate one. file_path = yield self.media_repo.generate_local_exact_thumbnail( - media_id, desired_width, desired_height, desired_method, desired_type + media_id, desired_width, desired_height, desired_method, desired_type, + url_cache=media_info["url_cache"], ) if file_path: |