mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-21 12:35:04 -05:00
Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none
Use user_id in email greeting if display name is null
This commit is contained in:
commit
07233a1ec8
@ -122,6 +122,8 @@ class Mailer(object):
|
|||||||
user_display_name = yield self.store.get_profile_displayname(
|
user_display_name = yield self.store.get_profile_displayname(
|
||||||
UserID.from_string(user_id).localpart
|
UserID.from_string(user_id).localpart
|
||||||
)
|
)
|
||||||
|
if user_display_name is None:
|
||||||
|
user_display_name = user_id
|
||||||
except StoreError:
|
except StoreError:
|
||||||
user_display_name = user_id
|
user_display_name = user_id
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user