diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-18 18:37:59 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-18 18:37:59 +0000 |
| commit | cd871a305708bca1acb5289f93cb62c15ba438da (patch) | |
| tree | e3149ac69165d4d3022c4e9c2333e0d8e445456b /synapse/rest | |
| parent | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config (diff) | |
| download | synapse-cd871a305708bca1acb5289f93cb62c15ba438da.tar.xz | |
Fix storage provider bug introduced when renamed to store_local
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/storage_provider.py | 2 |
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: |