summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-03-31 10:12:31 +0100
committerDavid Baker <dave@matrix.org>2016-03-31 10:12:31 +0100
commitc27c51484a306caf3946f205a933878c563d3d8a (patch)
tree29051314b4e3e4d10c50eaa743ca38b236963ece /synapse
parentspell out more packages (diff)
downloadsynapse-c27c51484a306caf3946f205a933878c563d3d8a.tar.xz
Don't ignore the obey overlay if the rule has an enabled attribute of False
Fixes https://github.com/vector-im/vector-web/issues/1244
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/push_rule_evaluator.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 51f73a5b78..c3c2877629 100644
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@@ -133,8 +133,9 @@ class PushRuleEvaluator:
             enabled = self.enabled_map.get(r['rule_id'], None)
             if enabled is not None and not enabled:
                 continue
-
-            if not r.get("enabled", True):
+            elif enabled is None and not r.get("enabled", True):
+                # if no override, check enabled on the rule itself
+                # (may have come from a base rule)
                 continue
 
             conditions = r['conditions']