From 02ed310e05b62b37e77c18414e069e741c40a119 Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Fri, 6 Jan 2017 18:55:36 +0100 Subject: [PATCH] use DEFAULT_FROM_EMAIL as sender address (#14111) --- corbo/models.py | 2 +- corbo/settings.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/corbo/models.py b/corbo/models.py index f8666b0..b9a7a99 100644 --- a/corbo/models.py +++ b/corbo/models.py @@ -141,7 +141,7 @@ class Broadcast(models.Model): handler = HTML2Text() activate(settings.LANGUAGE_CODE) template = loader.get_template('corbo/announce.html') - message = Message(subject=self.announce.title, mail_from=settings.CORBO_DEFAULT_FROM_EMAIL, + message = Message(subject=self.announce.title, mail_from=settings.DEFAULT_FROM_EMAIL, html=template.render( Context({'content': self.announce.text, 'unsubscribe_link_placeholder': UNSUBSCRIBE_LINK_PLACEHOLDER}))) diff --git a/corbo/settings.py b/corbo/settings.py index 38eeadf..16930b5 100644 --- a/corbo/settings.py +++ b/corbo/settings.py @@ -120,10 +120,6 @@ RSS_DESCRIPTION = '' RSS_LINK = '' RSS_LINK_TEMPLATE = '/#announce{0}' -# default mass emails expeditor -CORBO_DEFAULT_FROM_EMAIL = 'webmaster@localhost' - - # Authentication settings try: import mellon -- 2.11.0