sync with rev 1275 upstream

forum/templatetags/email_tags.py

@@ -20,7 +20,7 @@ class MultiUserMailMessage(template.Node):
             self.nodelist.render(context)
             messages.append((recipient, context['subject'], context['htmlcontent'], context['textcontent'], context['embeddedmedia']))
 
-        create_and_send_mail_messages(messages)
+        create_and_send_mail_messages(messages,context['sender'])
 
 @register.tag
 def email(parser, token):

forum/utils/mail.py

@@ -26,7 +26,7 @@ from threading import Thread
 
 def send_template_email(recipients, template, context):
     t = loader.get_template(template)
-    context.update(dict(recipients=recipients, settings=settings))
+    context.update(dict(recipients=recipients, settings=settings, sender=sender))
     t.render(Context(context))
 
 def create_connection():
@@ -44,13 +44,18 @@ def create_connection():
     return connection
 
 
-def create_and_send_mail_messages(messages):
+def create_and_send_mail_messages(messages, sender_data=None):
     if not settings.EMAIL_HOST:
         return
 
     sender = Header(unicode(settings.APP_SHORT_NAME), 'utf-8')
+
+    if sender_data == None:
         sender.append('<%s>' % unicode(settings.DEFAULT_FROM_EMAIL))
         sender = u'%s <%s>' % (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
+    else:
+        sender.append('<%s>' % unicode(sender_data['email']))
+        sender = u'%s <%s>' % (unicode(sender_data['name']), unicode(sender_data['email']))
 
     reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)