From 7b93e7ef53e5008bcb2caf6405f08e863c244789 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Sun, 17 Oct 2010 16:44:19 +0200 Subject: [PATCH] Fixed extensions not loading properly with overlays --- CHANGES | 2 ++ jinja2/environment.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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) -- 2.26.2