WW-5117 Adjusts expression checking

melanj · Jan 13, 2022 · 9c05422 · 9c05422
1 parent b0e18e9
commit 9c05422
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -32,6 +32,7 @@
 import org.apache.struts2.components.template.TemplateEngine;
 import org.apache.struts2.components.template.TemplateEngineManager;
 import org.apache.struts2.components.template.TemplateRenderingContext;
+import org.apache.struts2.dispatcher.StaticContentLoader;
 import org.apache.struts2.util.ComponentUtils;
 import org.apache.struts2.util.TextProviderHelper;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -1278,7 +1279,7 @@ public void setDynamicAttributes(Map<String, String> tagDynamicAttributes) {
             String attrValue = entry.getValue();
 
             if (!isValidTagAttribute(attrName)) {
-                if (ComponentUtils.altSyntax(getStack()) && ComponentUtils.containsExpression(attrValue) && !lazyEvaluation()) {
+                if (ComponentUtils.containsExpression(attrValue) && !lazyEvaluation()) {
                     String translated = TextParseUtil.translateVariables('%', attrValue, stack);
                     dynamicAttributes.put(attrName, ObjectUtils.defaultIfNull(translated, attrValue));
                 } else {