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

Use user_id in email greeting if display name is null
matrix-org · Jun 2, 2016 · 07233a1 · 07233a1
2 parents a04a2d0 + e793866
commit 07233a1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
@@ -122,6 +122,8 @@ def send_notification_mail(self, user_id, email_address, push_actions, reason):
             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