Ticket #949: django.patch

core/template/loader_tags.py

@@ -1 +1 @@
 from django.core.template import TemplateSyntaxError, TemplateDoesNotExist, resolve_variable
 from django.core.template import Library, Context, Node
-from django.core.template.loader import get_template, get_template_from_string, find_template_source
+from django.core.template.loader import select_template, get_template_from_string, find_template_source
 from django.conf.settings import TEMPLATE_DEBUG
 register = Library()
 
@@ -79 +79 @@
 class ConstantIncludeNode(Node):
     def __init__(self, template_path):
         try:
-            t = get_template(template_path)
+            t = select_template(template_path.split(','))
             self.template = t
         except:
             if TEMPLATE_DEBUG:
@@ -99 +99 @@
     def render(self, context):
          try:
              template_name = resolve_variable(self.template_name, context)
-             t = get_template(template_name)
+             t = select_template(template_name.split(','))
              return t.render(context)
          except TemplateSyntaxError, e:
              if TEMPLATE_DEBUG: