Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe

This commit is contained in:
David Baker 2016-06-02 13:35:25 +01:00
commit 3a3fb2f6f9
14 changed files with 44 additions and 35 deletions

View file

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