From 47fd3386fd88c92a9ea46d85fdddb2da3b7dc3ce Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 28 Jan 2025 15:32:00 +0530 Subject: [PATCH] Revert "fix: Always reset globals on cached templates (#30897)" (#30906) This reverts commit 32c1220c315a5265beabdda0588fe30ffcdff598. --- frappe/utils/jinja.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 4f4cfc162e..b8c979796a 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -52,12 +52,6 @@ def _get_jenv(): return super().is_safe_attribute(obj, attr, *args, **kwargs) - def get_template(self, *args, **kwargs): - # Note: jenv globals are reapplied here because we don't have true "global"/"local" separation. - # Ideally globals should never change as per Jinja design. - kwargs.update({"globals": self.globals}) - return super().get_template(*args, **kwargs) - # frappe will be loaded last, so app templates will get precedence jenv = FrappeSandboxedEnvironment(loader=get_jloader(), undefined=DebugUndefined, cache_size=32) set_filters(jenv) @@ -67,7 +61,9 @@ def _get_jenv(): def get_template(path): jenv = get_jenv() - return jenv.get_template(path) + # Note: jenv globals are reapplied here because we don't have true "global"/"local" separation. + # Ideally globals should never change as per Jinja design. + return jenv.get_template(path, globals=jenv.globals) def get_email_from_template(name, args):