summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2015-01-30 23:10:35 +0000
committerDavid Baker <dbkr@matrix.org>2015-01-30 23:10:35 +0000
commit0b354fcb8452540baf59b714f4d2186615dc5383 (patch)
treebad7631875b919e48febc024ee68accb9e2a0cbe /synapse
parentDon't assume all member events have a display nme. (diff)
downloadsynapse-0b354fcb8452540baf59b714f4d2186615dc5383.tar.xz
Again, don't assume all member events have displayname.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 75867b3c3c..28e5dae81d 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -101,7 +101,7 @@ class Pusher(object):
 
             # This loop does two things:
             # 1) Find our current display name
-            if mev.state_key == self.user_name:
+            if mev.state_key == self.user_name and 'displayname' in mev.content:
                 my_display_name = mev.content['displayname']
 
             # and 2) Get the number of people in that room