summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-11-29 18:27:05 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-11-29 18:27:05 +0000
commit3241c7aac3dc114a6abce46e5d241f42ed35a7fe (patch)
tree81dc0c83a96b1f0a720c8fc3f73c40bea0c0a03c /synapse/config
parentAdd user_directory_include_pattern config param to expand search results to a... (diff)
downloadsynapse-3241c7aac3dc114a6abce46e5d241f42ed35a7fe.tar.xz
untested WIP but might actually work
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/user_directory.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/config/user_directory.py b/synapse/config/user_directory.py
index 03fb2090c7..86177da401 100644
--- a/synapse/config/user_directory.py
+++ b/synapse/config/user_directory.py
@@ -22,18 +22,17 @@ class UserDirectoryConfig(Config):
     """
 
     def read_config(self, config):
-        self.user_directory_include_pattern = "%"
         user_directory_config = config.get("user_directory", None)
         if user_directory_config:
             self.user_directory_include_pattern = (
-                user_directory_config.get("include_pattern", "%")
+                user_directory_config.get("include_pattern", None)
             )
 
     def default_config(self, config_dir_path, server_name, **kwargs):
         return """
         # User Directory configuration
         # 'include_pattern' defines an optional SQL LIKE pattern when querying the
-        # user directory in addition to publicly visible users. Defaults to "%%"
+        # user directory in addition to publicly visible users. Defaults to None.
         #
         #user_directory:
         #   include_pattern: "%%:%s"