commit 1c274bc3c3d151e200c4712b31f3262b5c09618a
author Alon Ziv <nolaviz@google.com> Fri Jan 20 13:57:01 2023 +0000
committer Alon Ziv <nolaviz@google.com> Fri Jan 20 13:57:01 2023 +0000
tree dca35e0d014f4a3100fe1578eea35c02738acda4
parent 611f27ef978e49759bf47d400660c5a4de4764c1

Only use the new logic (without Collator) when `incompatibleImprovements` >= 2.3.33.

src/main/java/freemarker/core/EvalUtil.java

diff --git a/src/main/java/freemarker/core/EvalUtil.java b/src/main/java/freemarker/core/EvalUtil.java
index 83332c9..7bb9547 100644
--- a/src/main/java/freemarker/core/EvalUtil.java
+++ b/src/main/java/freemarker/core/EvalUtil.java
@@ -276,11 +276,14 @@
                 throw new _MiscTemplateException(defaultBlamed, env,
                         "Can't use operator \"", cmpOpToString(operator, operatorString), "\" on string values.");
             }
-            String leftString = Normalizer.normalize(
-                    EvalUtil.modelToString((TemplateScalarModel) leftValue, leftExp, env), Normalizer.Form.NFKC);
-            String rightString = Normalizer.normalize(
-                    EvalUtil.modelToString((TemplateScalarModel) rightValue, rightExp, env), Normalizer.Form.NFKC);
-            cmpResult = leftString.compareTo(rightString);
+            String leftString = EvalUtil.modelToString((TemplateScalarModel) leftValue, leftExp, env);
+            String rightString = EvalUtil.modelToString((TemplateScalarModel) rightValue, rightExp, env);
+            if (env.getConfiguration().getIncompatibleImprovements().intValue() <= _VersionInts.V_2_3_32) {
+                cmpResult = env.getCollator().compare(leftString, rightString);
+            } else {
+                cmpResult = Normalizer.normalize(leftString, Normalizer.Form.NFKC)
+                         .compareTo(Normalizer.normalize(rightString, Normalizer.Form.NFKC));
+            }
         } else if (leftValue instanceof TemplateBooleanModel && rightValue instanceof TemplateBooleanModel) {
             if (operator != CMP_OP_EQUALS && operator != CMP_OP_NOT_EQUALS) {
                 throw new _MiscTemplateException(defaultBlamed, env,