From 4c38b9dcb67a813cd01fa24fb0f84f925761dc68 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2026 21:28:10 +0000
Subject: [PATCH 1/2] TL3: make self-closing model-variable processors expose
 values to sibling markup

The TL3 base-class fix (removeTags + setLocalVariable) only makes contributed
values visible to the host element's body. NamedOrderProcessor and the deprecated
GoogleAnalyticsProcessor are documented as self-closing elements whose value is
read by a following sibling (<span>/<script>), so a body-scoped local variable is
never visible. Add an addToRequest() helper that sets a request attribute (read
live by Thymeleaf's WebEngineContext as ${var}) and use it in those two
processors to restore page-wide visibility.
---
 ...AbstractModelVariableModifierProcessor.java | 18 ++++++++++++++++++
 .../processor/GoogleAnalyticsProcessor.java    |  4 +++-
 .../web/processor/NamedOrderProcessor.java     |  6 ++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java b/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
index bb707823df..f06dd3ecfb 100644
--- a/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
+++ b/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
@@ -20,6 +20,7 @@
 package org.broadleafcommerce.common.web.dialect;
 
 import org.thymeleaf.context.ITemplateContext;
+import org.thymeleaf.context.IWebContext;
 import org.thymeleaf.model.IProcessableElementTag;
 import org.thymeleaf.processor.element.AbstractElementTagProcessor;
 import org.thymeleaf.processor.element.IElementTagStructureHandler;
@@ -75,6 +76,23 @@ protected void addToModel(IElementTagStructureHandler structureHandler, String k
         structureHandler.setLocalVariable(key, value);
     }
 
+    /**
+     * Adds a value to the current request so it is visible to the remainder of the page, including
+     * sibling elements. {@link #addToModel} contributes a Thymeleaf 3 local variable which is scoped
+     * to the host element's body; processors whose element is self-closing and whose value is consumed
+     * by following sibling markup must use this method instead so the value survives outside the body.
+     * Outside of a web request there is no request scope, so the value is not added.
+     *
+     * @param context the template context for the current request
+     * @param key the key to add to the request
+     * @param value the value represented by the key
+     */
+    protected void addToRequest(ITemplateContext context, String key, Object value) {
+        if (context instanceof IWebContext) {
+            ((IWebContext) context).getExchange().setAttributeValue(key, value);
+        }
+    }
+
     @SuppressWarnings("unchecked")
     protected <T> void addCollectionToExistingSet(ITemplateContext context, IElementTagStructureHandler structureHandler, String key, Collection<T> value) {
         Set<T> items = (Set<T>) context.getVariable(key);
diff --git a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
index cb9fc6e0e9..4318105c43 100644
--- a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
+++ b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
@@ -96,7 +96,9 @@ protected void modifyModelAttributes(ITemplateContext context, IProcessableEleme
         if (orderNumber != null) {
             order = orderService.findOrderByOrderNumber(orderNumber);
         }
-        addToModel(structureHandler, "analytics", analytics(getWebPropertyId(), order));
+        // This element is self-closing and "analytics" is consumed by a sibling <script>, so the value
+        // must be request-scoped (a body-scoped local variable would not be visible outside this element).
+        addToRequest(context, "analytics", analytics(getWebPropertyId(), order));
     }
 
     /**
diff --git a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
index dca270ab6e..8eca9d1cdb 100644
--- a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
+++ b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
@@ -73,10 +73,12 @@ protected void modifyModelAttributes(ITemplateContext context, IProcessableEleme
         String orderName = tag.getAttributeValue("orderName");
 
         Order order = orderService.findNamedOrderForCustomer(orderName, customer);
+        // This element is self-closing and orderVar is consumed by sibling markup, so the value must be
+        // request-scoped (a body-scoped local variable would not be visible outside this element).
         if (order != null) {
-            addToModel(structureHandler, orderVar, order);
+            addToRequest(context, orderVar, order);
         } else {
-            addToModel(structureHandler, orderVar, new NullOrderImpl());
+            addToRequest(context, orderVar, new NullOrderImpl());
         }
     }
 }

From a8ac0568bd336c80f52bfd2df030444a081e5fd8 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2026 21:35:00 +0000
Subject: [PATCH 2/2] TL3: resolve request via BroadleafRequestContext in
 addToRequest

Use the codebase's established BroadleafRequestContext.getRequest() pattern
(as in ContentProcessor/ResourceBundleProcessor after TL3.1 removed
IWebContext#getHttpServletRequest) to set the request attribute, instead of
casting the Thymeleaf context. WebEngineContext resolves ${var} from request
attributes, so siblings see the value.
---
 .../AbstractModelVariableModifierProcessor.java | 17 +++++++++++------
 .../web/processor/GoogleAnalyticsProcessor.java |  2 +-
 .../core/web/processor/NamedOrderProcessor.java |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java b/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
index f06dd3ecfb..da770ae0bf 100644
--- a/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
+++ b/common/src/main/java/org/broadleafcommerce/common/web/dialect/AbstractModelVariableModifierProcessor.java
@@ -19,8 +19,8 @@
  */
 package org.broadleafcommerce.common.web.dialect;
 
+import org.broadleafcommerce.common.web.BroadleafRequestContext;
 import org.thymeleaf.context.ITemplateContext;
-import org.thymeleaf.context.IWebContext;
 import org.thymeleaf.model.IProcessableElementTag;
 import org.thymeleaf.processor.element.AbstractElementTagProcessor;
 import org.thymeleaf.processor.element.IElementTagStructureHandler;
@@ -30,6 +30,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * @author apazzolini
  * 
@@ -81,15 +83,18 @@ protected void addToModel(IElementTagStructureHandler structureHandler, String k
      * sibling elements. {@link #addToModel} contributes a Thymeleaf 3 local variable which is scoped
      * to the host element's body; processors whose element is self-closing and whose value is consumed
      * by following sibling markup must use this method instead so the value survives outside the body.
-     * Outside of a web request there is no request scope, so the value is not added.
+     * Thymeleaf 3's web context resolves ${var} from the request attributes, so setting the attribute
+     * on the current request makes the value visible to the rest of the page. Outside of a web request
+     * there is no request scope, so the value is not added.
      *
-     * @param context the template context for the current request
      * @param key the key to add to the request
      * @param value the value represented by the key
      */
-    protected void addToRequest(ITemplateContext context, String key, Object value) {
-        if (context instanceof IWebContext) {
-            ((IWebContext) context).getExchange().setAttributeValue(key, value);
+    protected void addToRequest(String key, Object value) {
+        BroadleafRequestContext brc = BroadleafRequestContext.getBroadleafRequestContext();
+        HttpServletRequest request = (brc != null) ? brc.getRequest() : null;
+        if (request != null) {
+            request.setAttribute(key, value);
         }
     }
 
diff --git a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
index 4318105c43..bcc90c67de 100644
--- a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
+++ b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/GoogleAnalyticsProcessor.java
@@ -98,7 +98,7 @@ protected void modifyModelAttributes(ITemplateContext context, IProcessableEleme
         }
         // This element is self-closing and "analytics" is consumed by a sibling <script>, so the value
         // must be request-scoped (a body-scoped local variable would not be visible outside this element).
-        addToRequest(context, "analytics", analytics(getWebPropertyId(), order));
+        addToRequest("analytics", analytics(getWebPropertyId(), order));
     }
 
     /**
diff --git a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
index 8eca9d1cdb..80eff0e3aa 100644
--- a/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
+++ b/core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/NamedOrderProcessor.java
@@ -76,9 +76,9 @@ protected void modifyModelAttributes(ITemplateContext context, IProcessableEleme
         // This element is self-closing and orderVar is consumed by sibling markup, so the value must be
         // request-scoped (a body-scoped local variable would not be visible outside this element).
         if (order != null) {
-            addToRequest(context, orderVar, order);
+            addToRequest(orderVar, order);
         } else {
-            addToRequest(context, orderVar, new NullOrderImpl());
+            addToRequest(orderVar, new NullOrderImpl());
         }
     }
 }