diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
| commit | 07126e43a4db2d898e015186902031c8311093cb (patch) | |
| tree | 56c45f6cafd6ceaae2341b07de65c294327cd365 /synapse/api | |
| parent | remove white space (diff) | |
| parent | fix branch regexp (diff) | |
| download | synapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/filtering.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index eed8c67e6a..677c0bdd4c 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -172,7 +172,10 @@ USER_FILTER_SCHEMA = { # events a lot easier as we can then use a negative lookbehind # assertion to split '\.' If we allowed \\ then it would # incorrectly split '\\.' See synapse.events.utils.serialize_event - "pattern": "^((?!\\\).)*$" + # + # Note that because this is a regular expression, we have to escape + # each backslash in the pattern. + "pattern": r"^((?!\\\\).)*$" } } }, |