diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
| commit | 45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3 (patch) | |
| tree | 07bb21377c6611db89f64f948a2e27645662ff0e /synapse/config/user_directory.py | |
| parent | Add descriptions and remove redundant set(..) (diff) | |
| parent | Run Black. (#5482) (diff) | |
| download | synapse-45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_extremities
Diffstat (limited to 'synapse/config/user_directory.py')
| -rw-r--r-- | synapse/config/user_directory.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/user_directory.py b/synapse/config/user_directory.py index 023997ccde..e031b11599 100644 --- a/synapse/config/user_directory.py +++ b/synapse/config/user_directory.py @@ -26,11 +26,11 @@ class UserDirectoryConfig(Config): self.user_directory_search_all_users = False user_directory_config = config.get("user_directory", None) if user_directory_config: - self.user_directory_search_enabled = ( - user_directory_config.get("enabled", True) + self.user_directory_search_enabled = user_directory_config.get( + "enabled", True ) - self.user_directory_search_all_users = ( - user_directory_config.get("search_all_users", False) + self.user_directory_search_all_users = user_directory_config.get( + "search_all_users", False ) def default_config(self, config_dir_path, server_name, **kwargs): |