Permalink
Browse files

Merge branch '2.7-maintenance'

  • Loading branch information...
2 parents 8db4791 + 701e9ad commit 63227f05c52fa4518a96e65d37ca0492ac058535 @mitsuhiko mitsuhiko committed Aug 7, 2013
Showing with 8 additions and 1 deletion.
  1. +7 −0 CHANGES
  2. +1 −1 jinja2/loaders.py
View
@@ -1,6 +1,13 @@
Jinja2 Changelog
================
+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)
View
@@ -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)

0 comments on commit 63227f0

Please sign in to comment.