summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-20 13:45:13 +0000
committerDavid Baker <dave@matrix.org>2016-01-20 13:45:13 +0000
commit2309450a763fc79700c6abe32574c041335531f2 (patch)
tree5a064284d77b9dbcdb92cbbb4967ffa8468fd1d8
parentMerge remote-tracking branch 'origin/develop' into push_badge_counts (diff)
parentMerge branch 'dbkr/no_push_for_own_events' into develop (diff)
downloadsynapse-2309450a763fc79700c6abe32574c041335531f2.tar.xz
Merge branch 'develop' into push_badge_counts
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index f27ae62db5..b91c165e2b 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -107,7 +107,7 @@ class BulkPushRuleEvaluator:
             if len(filtered) == 0:
                 continue
 
-            if filtered.sender == uid:
+            if filtered[0].sender == uid:
                 continue
 
             for rule in rules: