Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #2343: Library.inclusion_tag now accepts a list of template nam…

…es along with a single name. Thanks, mderk@yandex.ru

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4cb22473278df29c998a75fb1646dc821c75e0cc 1 parent a888249
@jacobian jacobian authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/template/__init__.py
View
7 django/template/__init__.py
@@ -868,8 +868,11 @@ def render(self, context):
dict = func(*args)
if not getattr(self, 'nodelist', False):
- from django.template.loader import get_template
- t = get_template(file_name)
+ from django.template.loader import get_template, select_template
+ if hasattr(file_name, '__iter__'):
+ t = select_template(file_name)
+ else:
+ t = get_template(file_name)
self.nodelist = t.nodelist
return self.nodelist.render(context_class(dict))
Please sign in to comment.
Something went wrong with that request. Please try again.