diff options
| author | Quentin Gliech <quenting@element.io> | 2024-07-10 11:36:07 +0200 |
|---|---|---|
| committer | Quentin Gliech <quenting@element.io> | 2024-07-10 11:36:07 +0200 |
| commit | 8e229535fae246eb4ec54b5097f5aaaee2dc470d (patch) | |
| tree | d1a8d730b6f418521f89a8949c6d52a1e84ee108 /synapse | |
| parent | Add `rooms` `name` and `avatar` to Sliding Sync `/sync` (#17418) (diff) | |
| parent | 1.111.0rc2 (diff) | |
| download | synapse-8e229535fae246eb4ec54b5097f5aaaee2dc470d.tar.xz | |
Merge branch 'release-v1.111' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/federation/transport/server/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/server/__init__.py b/synapse/federation/transport/server/__init__.py index 5f997040d0..72599bb204 100644 --- a/synapse/federation/transport/server/__init__.py +++ b/synapse/federation/transport/server/__init__.py @@ -321,7 +321,7 @@ def register_servlets( servletclass == FederationMediaDownloadServlet or servletclass == FederationMediaThumbnailServlet ): - if not hs.config.server.enable_media_repo: + if not hs.config.media.can_load_media_repo: continue servletclass( diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index c94d454a28..1aa9ea3877 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -145,7 +145,7 @@ class ClientRestResource(JsonResource): password_policy.register_servlets(hs, client_resource) knock.register_servlets(hs, client_resource) appservice_ping.register_servlets(hs, client_resource) - if hs.config.server.enable_media_repo: + if hs.config.media.can_load_media_repo: from synapse.rest.client import media media.register_servlets(hs, client_resource) |