summaryrefslogtreecommitdiff
path: root/django/template/loader.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/template/loader.py')
-rw-r--r--django/template/loader.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/django/template/loader.py b/django/template/loader.py
index 60f24554f1..03e6f8d49d 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -76,14 +76,16 @@ def get_template(template_name):
Returns a compiled Template object for the given template name,
handling template inheritance recursively.
"""
- return get_template_from_string(*find_template_source(template_name))
+ source, origin = find_template_source(template_name)
+ template = get_template_from_string(source, origin, template_name)
+ return template
-def get_template_from_string(source, origin=None):
+def get_template_from_string(source, origin=None, name=None):
"""
Returns a compiled Template object for the given template code,
handling template inheritance recursively.
"""
- return Template(source, origin)
+ return Template(source, origin, name)
def render_to_string(template_name, dictionary=None, context_instance=None):
"""