Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15572 - include with "only" option discards context properties…

… (such as autoescape)

Thanks to dfoerster for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e9d27639470d2e76ce51a2522aedc69ff912de3e 1 parent 3349b95
@spookylukey spookylukey authored
View
8 django/template/context.py
@@ -99,6 +99,14 @@ def update(self, other_dict):
self.dicts.append(other_dict)
return other_dict
+ def new(self, values=None):
+ """
+ Returns a new Context with the same 'autoescape' value etc, but with
+ only the values given in 'values' stored.
+ """
+ return self.__class__(dict_=values, autoescape=self.autoescape,
+ current_app=self.current_app, use_l10n=self.use_l10n)
+
class RenderContext(BaseContext):
"""
A stack container for storing Template state.
View
2  django/template/loader_tags.py
@@ -136,7 +136,7 @@ def render_template(self, template, context):
values = dict([(name, var.resolve(context)) for name, var
in self.extra_context.iteritems()])
if self.isolated_context:
- return template.render(Context(values))
+ return template.render(context.new(values))
context.update(values)
output = template.render(context)
context.pop()
View
4 tests/regressiontests/templates/tests.py
@@ -1031,6 +1031,10 @@ def get_template_tests(self):
'include11': ('{% include "basic-syntax03" only with second=2 %}', {'first': '1'}, (' --- 2', 'INVALID --- 2')),
'include12': ('{% include "basic-syntax03" with first=1 only %}', {'second': '2'}, ('1 --- ', '1 --- INVALID')),
+ # autoescape context
+ 'include13': ('{% autoescape off %}{% include "basic-syntax03" %}{% endautoescape %}', {'first': '&'}, ('& --- ', '& --- INVALID')),
+ 'include14': ('{% autoescape off %}{% include "basic-syntax03" with first=var1 only %}{% endautoescape %}', {'var1': '&'}, ('& --- ', '& --- INVALID')),
+
'include-error01': ('{% include "basic-syntax01" with %}', {}, template.TemplateSyntaxError),
'include-error02': ('{% include "basic-syntax01" with "no key" %}', {}, template.TemplateSyntaxError),
'include-error03': ('{% include "basic-syntax01" with dotted.arg="error" %}', {}, template.TemplateSyntaxError),

0 comments on commit e9d2763

Please sign in to comment.
Something went wrong with that request. Please try again.