Mercurial > public > sg101

diff accounts/forms.py @ 892:79a71b9d0a2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Reply-To header when sending mail from other users. See issue #81.
author Brian Neal <bgneal@gmail.com>
date Mon, 16 Feb 2015 20:30:48 -0600
parents f416f5db3d91
children be233ba7ca31
line wrap: on
line diff
--- a/accounts/forms.py	Mon Feb 16 18:58:49 2015 -0600
+++ b/accounts/forms.py	Mon Feb 16 20:30:48 2015 -0600
@@ -183,7 +183,7 @@
         # Send the confirmation email
 
         site = Site.objects.get_current()
-        admin_email = settings.ADMINS[0][1]
+        admin_email = settings.DEFAULT_FROM_EMAIL
 
         activation_link = 'http://%s%s' % (site.domain, reverse('accounts.views.register_confirm',
                 kwargs = {'username' : pending_user.username, 'key' : pending_user.key}))
@@ -199,8 +199,7 @@
                 })
 
         subject = 'Registration Confirmation for ' + site.name
-        send_mail(subject, msg, admin_email, [self.cleaned_data['email']],
-                defer=False)
+        send_mail(subject, msg, admin_email, [self.cleaned_data['email']])
         logger.info('Accounts/registration conf. email sent to %s for user %s; IP = %s',
                 self.cleaned_data['email'], pending_user.username, self.ip)
 
@@ -226,7 +225,7 @@
             return
 
         site = Site.objects.get_current()
-        admin_email = settings.ADMINS[0][1]
+        admin_email = settings.DEFAULT_FROM_EMAIL
 
         subject = 'Forgotten username for %s' % site.name
         msg = render_to_string('accounts/forgot_user_email.txt', {
@@ -234,7 +233,7 @@
             'site': site,
             'admin_email': admin_email,
             })
-        send_mail(subject, msg, admin_email, [email], defer=False)
+        send_mail(subject, msg, admin_email, [email])
 
         logger.info('Forgotten username email sent to {} <{}>'.format(
             user.username, email))