Ticket #12018: comments_request_context2.diff

django/contrib/comments/moderation.py

@@ -60 +60 @@
 from django.core.mail import send_mail
 from django.contrib.comments import signals
 from django.db.models.base import ModelBase
-from django.template import Context, loader
+from django.template import RequestContext, loader
 from django.contrib import comments
 from django.contrib.sites.models import Site
 
@@ -227 +227 @@
                 return True
         return False
 
-    def email(self, comment, content_object, request):
+    def email(self, comment, content_object, request, extra_context=None):
         """
         Send email notification of a new comment to site staff when email
         notifications have been requested.
@@ -237 +237 @@
             return
         recipient_list = [manager_tuple[1] for manager_tuple in settings.MANAGERS]
         t = loader.get_template('comments/comment_notification_email.txt')
-        c = Context({ 'comment': comment,
-                      'content_object': content_object })
+
+        context = { 'comment': comment, 'content_object': content_object }
+        context.update(extra_context or {})
         subject = '[%s] New comment posted on "%s"' % (Site.objects.get_current().name,
                                                           content_object)
-        message = t.render(c)
+        message = t.render(RequestContext(context))
         send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
 
 class Moderator(object):

docs/ref/contrib/comments/moderation.txt

@@ -159 +159 @@
     post on the content object, and ``False`` otherwise (in which
     case the comment will be immediately deleted).
 
-.. method:: CommentModerator.email(comment, content_object, request)
+.. method:: CommentModerator.email(comment, content_object, request, extra_context=None)
 
     If email notification of the new comment should be sent to
     site staff or moderators, this method is responsible for