Ticket #11989: inclusion_template.diff

File inclusion_template.diff, 808 bytes (added by Jeremy Dunck, 15 years ago)

  • django/template/__init__.py 

    diff --git a/django/template/__init__.py b/django/template/__init__.py
index 5493e5b..23f4c73 100644
    a b class Library(object):  
    937937
    938938                    if not getattr(self, 'nodelist', False):
    939939                        from django.template.loader import get_template, select_template
    940                         if not isinstance(file_name, basestring) and is_iterable(file_name):
     940                        if isinstance(file_name, Template):
     941                            t = file_name
     942                        elif not isinstance(file_name, basestring) and is_iterable(file_name):
    941943                            t = select_template(file_name)
    942944                        else:
    943945                            t = get_template(file_name)
Back to Top