summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-25 15:39:19 +0100
committerErik Johnston <erik@matrix.org>2017-04-25 15:39:19 +0100
commitacb58bfb6a3523c67b3d426bb6a25b7329a4604f (patch)
tree9f574e7b8f42a7158846fd37c3967b043dfc5c06
parentDon't specify default as dict (diff)
downloadsynapse-acb58bfb6a3523c67b3d426bb6a25b7329a4604f.tar.xz
fix up
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index e40f62de78..f943ff640f 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -91,7 +91,8 @@ class BulkPushRuleEvaluator:
             profile_info = room_members.get(uid)
             if profile_info:
                 display_name = profile_info.display_name
-            else:
+
+            if not display_name:
                 # Handle the case where we are pushing a membership event to
                 # that user, as they might not be already joined.
                 if event.type == EventTypes.Member and event.state_key == uid: