From 6d00daa9ee9fc7d0879adbce0a43d844aa9c9965 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 26 Feb 2020 17:34:37 +0100 Subject: [PATCH] Fix crash when sending mails with empty mail_from --- src/pretix/base/services/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py index f2de28b01..43459b066 100644 --- a/src/pretix/base/services/mail.py +++ b/src/pretix/base/services/mail.py @@ -126,7 +126,7 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString], renderer = ClassicMailRenderer(None) content_plain = body_plain = render_mail(template, context) subject = str(subject).format_map(TolerantDict(context)) - sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM) + sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM) or settings.MAIL_FROM if event: sender_name = event.settings.mail_from_name or str(event.name) sender = formataddr((sender_name, sender))