diff contact/forms.py @ 893:3aecf9058130

Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Tue, 17 Feb 2015 18:59:06 -0600
parents 79a71b9d0a2a
children 6ac56115e0a8
line wrap: on
line diff
--- a/contact/forms.py	Tue Feb 10 20:36:34 2015 -0600
+++ b/contact/forms.py	Tue Feb 17 18:59:06 2015 -0600
@@ -38,8 +38,11 @@
                     'site_name': site.name,
                     'user_name': self.cleaned_data['name'],
                     'user_email': self.cleaned_data['email'],
+                    'subject': self.cleaned_data['subject'],
                     'message': self.cleaned_data['message'],
                 })
 
         subject = site.name + ' Feedback: ' + self.cleaned_data['subject']
-        send_mail(subject, msg, self.cleaned_data['email'], self.recipient_list)
+        from_email = settings.GPP_NO_REPLY_EMAIL + '@' + site.domain
+        send_mail(subject, msg, from_email, self.recipient_list,
+                  reply_to=self.cleaned_data['email'])