Ticket #15070: 15070.2.diff

django/template/base.py

@@ -928 +928 @@
                         else:
                             t = get_template(file_name)
                         self.nodelist = t.nodelist
-                    new_context = context_class(dict, autoescape=context.autoescape)
+                    new_context = context_class(dict, autoescape=context.autoescape, current_app=context.current_app)
                     # 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 as possible.

tests/regressiontests/templates/custom.py

@@ -78 +78 @@
         self.verify_tag(custom.inclusion_explicit_no_context, 'inclusion_explicit_no_context')
         self.verify_tag(custom.inclusion_no_params_with_context, 'inclusion_no_params_with_context')
         self.verify_tag(custom.inclusion_params_and_context, 'inclusion_params_and_context')
+
+    def test_15070(self):
+        '''
+        Test that inclusion tag passes down `current_app` of context to the
+        Context of the included/rendered template as well.
+        '''
+        c = template.Context({})
+        t = template.Template('{% load custom %}{% inclusion_tag_no_params %}')
+        self.assertEquals(t.render(c).strip(), u'None')
+
+        c.current_app = 'advanced'
+        self.assertEquals(t.render(c).strip(), u'advanced')

new file tests/regressiontests/templates/templates/test_incl_tag.html

@@ +1 @@
+{% load custom %}{% current_app %}

tests/regressiontests/templates/templatetags/custom.py

@@ -69 +69 @@
     return {"result" : "inclusion_params_and_context - Expected result (context value: %s): %s" % (context['value'], arg)}
 inclusion_params_and_context.anything = "Expected inclusion_params_and_context __dict__"
 
+@register.simple_tag(takes_context=True)
+def current_app(context):
+    return "%s" % context.current_app
+
+@register.inclusion_tag('test_incl_tag.html', takes_context=True)
+def inclusion_tag_no_params(context):
+    return {}