Browse files

Preserved context class in inclusion_tag.

Previously, when a template was rendered with RequestContext, inclusion
tags were rendered with a plain context, losing additional information
available in the RequestContext.

The (admittedly bizarre) implementation of has the
side-effect of not running template context processors, making this
change backwards-compatible.
  • Loading branch information...
aaugustin committed Dec 14, 2014
1 parent fdbfc98 commit e53495ba3352c2c0fdb6178f2b333c30cb6b5d46
Showing with 2 additions and 8 deletions.
  1. +2 −8 django/template/
@@ -1257,7 +1257,7 @@ def compile_func(parser, token):
raise TemplateSyntaxError("Invalid arguments provided to assignment_tag")
def inclusion_tag(self, file_name, context_class=Context, takes_context=False, name=None):
def inclusion_tag(self, file_name, takes_context=False, name=None):
def dec(func):
params, varargs, varkw, defaults = getargspec(func)
@@ -1277,13 +1277,7 @@ def render(self, context):
t = context.engine.get_template(file_name)
self.nodelist = t.nodelist
new_context = context_class(_dict, **{
'autoescape': context.autoescape,
'current_app': context.current_app,
'use_l10n': context.use_l10n,
'use_tz': context.use_tz,
'engine': context.engine,
new_context =
# Copy across the CSRF token, if present, because
# inclusion tags are often used for forms, and we need
# instructions for using CSRF protection to be as simple

0 comments on commit e53495b

Please sign in to comment.