diff options
| author | Aditya | 2016-03-23 01:57:00 +0530 |
|---|---|---|
| committer | Barry Warsaw | 2016-03-23 13:11:36 -0400 |
| commit | ff038207629c311e257734cd2b01ec5ca9e4d221 (patch) | |
| tree | 1951eebe1d8948e864876d67bb19f8cffc4c9c97 /src/mailman/app/notifications.py | |
| parent | bc3c325683657d62a1d9864a289023ebccc779c8 (diff) | |
| download | mailman-ff038207629c311e257734cd2b01ec5ca9e4d221.tar.gz mailman-ff038207629c311e257734cd2b01ec5ca9e4d221.tar.zst mailman-ff038207629c311e257734cd2b01ec5ca9e4d221.zip | |
Diffstat (limited to 'src/mailman/app/notifications.py')
| -rw-r--r-- | src/mailman/app/notifications.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py index 3e7fb4938..b20cc6432 100644 --- a/src/mailman/app/notifications.py +++ b/src/mailman/app/notifications.py @@ -77,7 +77,13 @@ def send_welcome_message(mlist, member, language, text=''): welcome_message = _get_message(mlist.welcome_message_uri, mlist, language) options_url = member.options_url # Get the text from the template. - display_name = ('' if member.user is None else member.user.display_name) + if member.subscriber.display_name: + display_name = member.subscriber.display_name + elif member.user: + display_name = ('' if member.user.display_name is None + else member.user.display_name) + else: + display_name = '' text = expand(welcome_message, dict( fqdn_listname=mlist.fqdn_listname, list_name=mlist.display_name, |