Ticket #9977: csrf_templatetag2.diff

django/contrib/csrf/templatetags/csrf.py

@@ +1 @@
+from django import template
+
+register = template.Library()
+
+class CsrfTokenNode(template.Node):
+    def __init__(self, useid=True):
+        self.useid = useid
+    
+    def render(self, context):
+        csrf_token = context.get('csrf_token')
+        if csrf_token:
+            return ('<div style="display:none;">'
+                    '<input type="hidden" %s'
+                    'name="csrfmiddlewaretoken" value="%s" /></div>'
+                    ) % (self.useid and 'id="csrfmiddlewaretoken" ' or '', csrf_token)
+        else:
+            return ''
+
+@register.tag
+def csrf_token(parser, token):
+    args = token.contents.split()
+    
+    if u'noid' in args[1:] or hasattr(parser, '_csrf_used'):
+        return CsrfTokenNode(False)
+    else:
+        parser._csrf_used = True
+        return CsrfTokenNode()

django/contrib/csrf/context_processors.py

@@ +1 @@
+from django.contrib.csrf.middleware import _make_token
+
+def csrf(request):
+    if hasattr(request, 'session'):
+        return {'csrf_token': _make_token(request.session.session_key)}
+    else:
+        return {}