summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-02 13:35:25 +0100
committerDavid Baker <dave@matrix.org>2016-06-02 13:35:25 +0100
commit3a3fb2f6f9d958d62a96391491f794042d1a419c (patch)
treeb0085e37f02db4f019440086a91905057843889b /synapse/push
parentEmail unsubscribing that may in theory, work (diff)
parentSplit out the auth handler (diff)
downloadsynapse-3a3fb2f6f9d958d62a96391491f794042d1a419c.tar.xz
Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/mailer.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 95250bad7d..b96cab5ef8 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -124,6 +124,8 @@ class Mailer(object):
             user_display_name = yield self.store.get_profile_displayname(
                 UserID.from_string(user_id).localpart
             )
+            if user_display_name is None:
+                user_display_name = user_id
         except StoreError:
             user_display_name = user_id