Use DEFAULT_FROM_EMAIL rather than PATCHWORK_FROM_EMAIL

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/views/user.py b/apps/patchwork/views/user.py
index 4a34414a01446399b5b74b70ef851f62f3cc7c8f..19091d30ce6e4a06c0f2e8e1246ff5bcc25c0a86 100644 (file)
--- a/apps/patchwork/views/user.py
+++ b/apps/patchwork/views/user.py
@@ -75,7 +75,7 @@ def link(request):
                 send_mail('Patchwork email address confirmation',
                             render_to_string('patchwork/user-link.mail',
                                 context),
-                            settings.PATCHWORK_FROM_EMAIL,
+                            settings.DEFAULT_FROM_EMAIL,
                             [form.cleaned_data['email']])
                 conf.save()
             except Exception, ex:

diff --git a/apps/settings.py b/apps/settings.py
index 8b33182de5c09ea9ead42a247d70bc179ff946f9..719b9d174cbfb82a16690cd3515f793a6b0a70d3 100644 (file)
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -94,6 +94,6 @@ INSTALLED_APPS = (
 )
 
 DEFAULT_PATCHES_PER_PAGE = 100
-PATCHWORK_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
+DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
 ACCOUNT_ACTIVATION_DAYS = 7