Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none

Use user_id in email greeting if display name is null
pull/817/head
David Baker 2016-06-02 09:52:19 +01:00
commit 07233a1ec8
1 changed files with 2 additions and 0 deletions

View File

@ -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