Fixed prefix loader now properly forward globals.

This fixes #238

diff --git a/CHANGES b/CHANGES
index 94b07bc6b96a731ccb6234bec4573be634d4eb15..6425de50c4bdf1c8b1408097d305cf39851030ec 100644 (file)
--- 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 a9a2625274c28c36125ecd01f70601194e36d6a1..cc9c6836e783300993e580994a3811a84de5db63 100644 (file)
--- 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)