Fixed extensions not loading properly with overlays

diff --git a/CHANGES b/CHANGES
index cbeefa7af87acaa4240eba979dc43286b24a5a80..d07be9e372765b7fc67ebd84f298d99f0f5db6d8 100644 (file)
--- 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 a94bc6eaedccc1947c2e81d16b897b53340dd5cc..ac74a5c68fd0d91538c16e6faaee7690502cec25 100644 (file)
--- 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)