summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-06-02 09:52:19 +0100
committerDavid Baker <dbkr@users.noreply.github.com>2016-06-02 09:52:19 +0100
commit07233a1ec89bdb3b778506959d7508fc13487e88 (patch)
treebbd7ccdf2ca191d76b425f07534760b2f3163663 /synapse
parentMerge pull request #807 from matrix-org/erikj/push_rules_cache (diff)
parentUse user_id in email greeting if display name is null (diff)
downloadsynapse-07233a1ec89bdb3b778506959d7508fc13487e88.tar.xz
Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none
Use user_id in email greeting if display name is null
Diffstat (limited to '')
-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 3ae92d1574..fe5d67a03c 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -122,6 +122,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