From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 7 Aug 2013 15:01:00 +0000 (+0100)
Subject: Fixed prefix loader now properly forward globals.
X-Git-Tag: 2.7.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701e9ada2b6968cf2bc41a3c1d4235922ce164f5;p=thirdparty%2Fjinja.git

Fixed prefix loader now properly forward globals.

This fixes #238
---

diff --git a/CHANGES b/CHANGES
index 94b07bc6..6425de50 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 a9a26252..cc9c6836 100644
--- a/jinja2/loaders.py
+++ b/jinja2/loaders.py
@@ -349,7 +349,7 @@ class PrefixLoader(BaseLoader):
     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)