This is an automated email from the ASF dual-hosted git repository. jacopoc pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 7228e7667272dd55b61befea572ad7ebf1edadcf Author: Jacopo Cappellato <[email protected]> AuthorDate: Wed Oct 28 15:46:30 2026 +0100 Simplify sanitizer assignment logic in UtilCodec --- .../main/java/org/apache/ofbiz/base/util/UtilCodec.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java index 02e889a7f0..a260f18312 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java @@ -164,21 +164,12 @@ public class UtilCodec { } if (policy != null) { - if (UtilValidate.isNotEmpty(sanitizer)) { - sanitizer = sanitizer.and(policy); - } else { - sanitizer = policy; - } + sanitizer = policy; return sanitizer.sanitize(original); } } else { - if (UtilValidate.isNotEmpty(sanitizer)) { - sanitizer = sanitizer.and(Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and( - Sanitizers.LINKS).and(Sanitizers.STYLES)); - } else { - sanitizer = Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and( - Sanitizers.LINKS).and(Sanitizers.STYLES); - } + sanitizer = Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and( + Sanitizers.LINKS).and(Sanitizers.STYLES); } // Fallback should be the default option PERMISSIVE_POLICY
