summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-01-18 18:37:59 +0000
committerErik Johnston <erik@matrix.org>2018-01-18 18:37:59 +0000
commitcd871a305708bca1acb5289f93cb62c15ba438da (patch)
treee3149ac69165d4d3022c4e9c2333e0d8e445456b
parentMerge pull request #2812 from matrix-org/erikj/media_storage_provider_config (diff)
downloadsynapse-cd871a305708bca1acb5289f93cb62c15ba438da.tar.xz
Fix storage provider bug introduced when renamed to store_local
-rw-r--r--synapse/rest/media/v1/storage_provider.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/storage_provider.py b/synapse/rest/media/v1/storage_provider.py
index 0a84aba861..c188192f2b 100644
--- a/synapse/rest/media/v1/storage_provider.py
+++ b/synapse/rest/media/v1/storage_provider.py
@@ -77,7 +77,7 @@ class StorageProviderWrapper(StorageProvider):
         self.store_remote = store_remote
 
     def store_file(self, path, file_info):
-        if not self.store:
+        if not file_info.server_name and not self.store_local:
             return defer.succeed(None)
 
         if file_info.server_name and not self.store_remote: