From 705a15071e48ea0c57b202d438019fae4074cc57 Mon Sep 17 00:00:00 2001 From: Wil Clouser Date: Fri, 9 Apr 2010 20:49:36 -0700 Subject: [PATCH] Use DEFAULT_FROM_EMAIL; bug 557342 --- apps/amo/utils.py | 2 +- apps/stats/models.py | 2 +- settings.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/amo/utils.py b/apps/amo/utils.py index 10047e14ca..997c04f962 100644 --- a/apps/amo/utils.py +++ b/apps/amo/utils.py @@ -41,7 +41,7 @@ def send_mail(subject, message, from_email=None, recipient_list=None, return True if not from_email: - from_email = settings.EMAIL_FROM_DEFAULT + from_email = settings.DEFAULT_FROM_EMAIL # Prune blacklisted emails. white_list = [] diff --git a/apps/stats/models.py b/apps/stats/models.py index 028e003193..d3d36b6cc3 100644 --- a/apps/stats/models.py +++ b/apps/stats/models.py @@ -142,7 +142,7 @@ class Contribution(caching.base.CachingMixin, models.Model): raise ContributionError('Transaction not complete') # Send from support_email, developer's email, or default. - from_email = settings.EMAIL_FROM_DEFAULT + from_email = settings.DEFAULT_FROM_EMAIL if self.addon.support_email: from_email = str(self.addon.support_email) else: diff --git a/settings.py b/settings.py index 93916895d6..ab90f9e38e 100644 --- a/settings.py +++ b/settings.py @@ -357,8 +357,6 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True SESSION_COOKIE_AGE = 1209600 SESSION_COOKIE_SECURE = True -DEFAULT_FROM_EMAIL = "Mozilla Add-ons " - # These should have app+locale at the start to avoid redirects LOGIN_URL = "/users/login" LOGOUT_URL = "/users/logout" @@ -373,7 +371,7 @@ CAKE_SESSION_TIMEOUT = 8640 PAYPAL_CGI_URL = 'https://www.paypal.com/cgi-bin/webscr' # Email settings -EMAIL_FROM_DEFAULT = 'nobody@mozilla.org' +DEFAULT_FROM_EMAIL = "Mozilla Add-ons " # Email goes to the console by default. s/console/smtp/ for regular delivery EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'