From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 17 Oct 2010 14:44:19 +0000 (+0200)
Subject: Fixed extensions not loading properly with overlays
X-Git-Tag: 2.5.4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b93e7ef53e5008bcb2caf6405f08e863c244789;p=jinja2.git

Fixed extensions not loading properly with overlays
---

diff --git a/CHANGES b/CHANGES
index cbeefa7..d07be9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@ Version 2.5.4
 -------------
 (bugfix release, release date to be announced)
 
+- Fixed extensions not loading properly with overlays.
+
 Version 2.5.3
 -------------
 (bugfix release, released on October 17th 2010)
diff --git a/jinja2/environment.py b/jinja2/environment.py
index a94bc6e..ac74a5c 100644
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -335,7 +335,7 @@ class Environment(object):
         for key, value in self.extensions.iteritems():
             rv.extensions[key] = value.bind(rv)
         if extensions is not missing:
-            rv.extensions.update(load_extensions(extensions))
+            rv.extensions.update(load_extensions(rv, extensions))
 
         return _environment_sanity_check(rv)