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

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

This commit is contained in:
David Baker 2016-01-20 13:40:22 +00:00
parent ccf9387d57 d4cefb6289
commit 7441d8cc0c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/push/bulk_push_rule_evaluator.py
View File

@ -107,6 +107,9 @@ class BulkPushRuleEvaluator:
if len(filtered) == 0: if len(filtered) == 0:
continue continue
if filtered.sender == uid:
continue
for rule in rules: for rule in rules:
if 'enabled' in rule and not rule['enabled']: if 'enabled' in rule and not rule['enabled']:
continue continue