From a52b8a13fdf6cd6ba42d4fe31bfe36bdf60c0065 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 2 Sep 2020 09:57:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(common)=20=E4=BF=AE=E5=A4=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=9C=AA=E8=AE=BE=E7=BD=AEEmail=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=89=8D=E7=BC=80=E5=AF=BC=E8=87=B4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/tasks.py b/apps/common/tasks.py index aecc54ca7..eeeee7214 100644 --- a/apps/common/tasks.py +++ b/apps/common/tasks.py @@ -24,7 +24,7 @@ def send_mail_async(*args, **kwargs): """ if len(args) == 3: args = list(args) - args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0] + args[0] = (settings.EMAIL_SUBJECT_PREFIX or '') + args[0] email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER args.insert(2, email_from) args = tuple(args)