Fix branch didn't check word_boundary

2016-01-18 17:04:36 +00:00 · 2016-01-18 17:04:36 +00:00 · 47f82e4408
parent 5cd2126a6a
commit 47f82e4408
1 changed files with 9 additions and 3 deletions
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@ -273,10 +273,16 @@ def _glob_matches(glob, value, word_boundary=False):
            ),
            r,
        )
-        r = r + "$"
-        r = re.compile(r, flags=re.IGNORECASE)
+        if word_boundary:
+            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:
        r = re.escape(glob)
        r = "\b%s\b" % (r,)