summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:55:25 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:55:25 +0000
commit49758a1f674380a2fefdfcc92b66ec9a1f594df7 (patch)
treeb808173de9c21d457fd230e5cae804ead8d10063
parentUpdate INSTALL.md to say that Python 2 is no longer supported (#5953) (diff)
parentfix thumbnail storage location (#5915) (diff)
downloadsynapse-49758a1f674380a2fefdfcc92b66ec9a1f594df7.tar.xz
fix thumbnail storage location (#5915)
-rw-r--r--changelog.d/5915.bugfix1
-rw-r--r--synapse/rest/media/v1/media_repository.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5915.bugfix b/changelog.d/5915.bugfix
new file mode 100644

index 0000000000..bf5b99fedc --- /dev/null +++ b/changelog.d/5915.bugfix
@@ -0,0 +1 @@ +Fix 404 for thumbnail download when `dynamic_thumbnails` is `false` and the thumbnail was dynamically generated. Fix reported by rkfg. diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py
index d4ea09260c..b972e152a9 100644 --- a/synapse/rest/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py
@@ -526,7 +526,7 @@ class MediaRepository(object): try: file_info = FileInfo( server_name=server_name, - file_id=media_id, + file_id=file_id, thumbnail=True, thumbnail_width=t_width, thumbnail_height=t_height,