Ticket #8088: include_tag.diff

django/template/loader_tags.py

@@ -1 @@
-from django.template import TemplateSyntaxError, TemplateDoesNotExist, Variable
+from django.template import TemplateSyntaxError, TemplateDoesNotExist, VariableNode
 from django.template import Library, Node, TextNode
 from django.template.loader import get_template, get_template_from_string, find_template_source
 from django.conf import settings
@@ -114 +114 @@
 
 class IncludeNode(Node):
     def __init__(self, template_name):
-        self.template_name = Variable(template_name)
+        self.template_name = VariableNode(template_name)
 
     def render(self, context):
         try:
-            template_name = self.template_name.resolve(context)
+            template_name = self.template_name.render(context)
             t = get_template(template_name)
             return t.render(context)
         except TemplateSyntaxError, e:
@@ -178 +178 @@
     Example::
 
         {% include "foo/some_include" %}
+        {% include var_template_name %}
+        {% include var_template_name|lower %}
     """
     bits = token.contents.split()
     if len(bits) != 2:
         raise TemplateSyntaxError, "%r tag takes one argument: the name of the template to be included" % bits[0]
     path = bits[1]
-    if path[0] in ('"', "'") and path[-1] == path[0]:
+    if path[0] in ('"', "'") and path[-1] == path[0] and not path[0] in path[1:-1]:
         return ConstantIncludeNode(path[1:-1])
-    return IncludeNode(bits[1])
+    return IncludeNode(parser.compile_filter(bits[1]))
 
 register.tag('block', do_block)
 register.tag('extends', do_extends)