summary refs log tree commit diff
path: root/synapse/config/user_directory.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 11:34:45 +0100
committerGitHub <noreply@github.com>2019-06-24 11:34:45 +0100
commitc3c6b00d956937ad50673cec75eab7989938a39b (patch)
treebb60d510a3c0c95c678179559914c6f7c60c3821 /synapse/config/user_directory.py
parentFactor acme bits out to a separate file (#5521) (diff)
downloadsynapse-c3c6b00d956937ad50673cec75eab7989938a39b.tar.xz
Pass config_dir_path and data_dir_path into Config.read_config. (#5522)
* Pull config_dir_path and data_dir_path calculation out of read_config_files

* Pass config_dir_path and data_dir_path into read_config
Diffstat (limited to 'synapse/config/user_directory.py')
-rw-r--r--synapse/config/user_directory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/user_directory.py b/synapse/config/user_directory.py
index e031b11599..0665dc3fcf 100644
--- a/synapse/config/user_directory.py
+++ b/synapse/config/user_directory.py
@@ -21,7 +21,7 @@ class UserDirectoryConfig(Config):
     Configuration for the behaviour of the /user_directory API
     """
 
-    def read_config(self, config):
+    def read_config(self, config, **kwargs):
         self.user_directory_search_enabled = True
         self.user_directory_search_all_users = False
         user_directory_config = config.get("user_directory", None)