Merge remote-tracking branch 'origin/develop' into push_badge_counts

2016-01-20 13:40:22 +00:00 · 2016-01-20 13:40:22 +00:00 · 7441d8cc0c
parent ccf9387d57 d4cefb6289
commit 7441d8cc0c
1 changed files with 3 additions and 0 deletions
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@ -107,6 +107,9 @@ class BulkPushRuleEvaluator:
            if len(filtered) == 0:
                continue

+            if filtered.sender == uid:
+                continue
+
            for rule in rules:
                if 'enabled' in rule and not rule['enabled']:
                    continue