From b34b8a12b7f657f379c9e0e5ee7688bf36e242d2 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Fri, 28 Nov 2014 22:32:10 +0100
Subject: [PATCH] Passed a reference to the current engine when instantiating
 Template.

---
 django/template/defaulttags.py | 2 +-
 django/template/engine.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 405de785e8..176601baa4 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -403,7 +403,7 @@ class SsiNode(Node):
             output = ''
         if self.parsed:
             try:
-                t = Template(output, name=filepath)
+                t = Template(output, name=filepath, engine=context.engine)
                 return t.render(context)
             except TemplateSyntaxError as e:
                 if settings.DEBUG:
diff --git a/django/template/engine.py b/django/template/engine.py
index 027d034877..5838877a9f 100644
--- a/django/template/engine.py
+++ b/django/template/engine.py
@@ -126,7 +126,7 @@ class Engine(object):
         Returns a compiled Template object for the given template code,
         handling template inheritance recursively.
         """
-        return Template(source, origin, name)
+        return Template(source, origin, name, engine=self)
 
     def get_template(self, template_name, dirs=_dirs_undefined):
         """