From 701e9ada2b6968cf2bc41a3c1d4235922ce164f5 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Wed, 7 Aug 2013 16:01:00 +0100 Subject: [PATCH] Fixed prefix loader now properly forward globals. This fixes #238 --- CHANGES | 3 +++ jinja2/loaders.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 94b07bc6b..6425de50c 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ Version 2.7.2 ------------- (bugfix release, release date to be decided) +- Prefix loader was not forwarding the locals properly to + inner loaders. This is now fixed. + Version 2.7.1 ------------- (bugfix release, released on August 7th 2013) diff --git a/jinja2/loaders.py b/jinja2/loaders.py index a9a262527..cc9c6836e 100644 --- a/jinja2/loaders.py +++ b/jinja2/loaders.py @@ -349,7 +349,7 @@ def get_source(self, environment, template): def load(self, environment, name, globals=None): loader, local_name = self.get_loader(name) try: - return loader.load(environment, local_name) + return loader.load(environment, local_name, globals) except TemplateNotFound: # re-raise the exception with the correct fileame here. # (the one that includes the prefix)