Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix branch didn't check word_boundary

This commit is contained in:
Erik Johnston 2016-01-18 17:04:36 +00:00
parent 5cd2126a6a
commit 47f82e4408
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/push/push_rule_evaluator.py
View File

@ -273,10 +273,16 @@ def _glob_matches(glob, value, word_boundary=False):
), ),
r, r,
) )
r = r + "$" if word_boundary:
r = re.compile(r, flags=re.IGNORECASE) r = "\b%s\b" % (r,)
r = re.compile(r, flags=re.IGNORECASE)
return r.match(value) return r.search(value)
else:
r = r + "$"
r = re.compile(r, flags=re.IGNORECASE)
return r.match(value)
elif word_boundary: elif word_boundary:
r = re.escape(glob) r = re.escape(glob)
r = "\b%s\b" % (r,) r = "\b%s\b" % (r,)