Fix so i;ascii-numeric comparator is not forced as default for :count and :value operators

Fix date/currentdate related form issues and comparators handling (#1489346)

1 files changed, 4 insertions, 5 deletions

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index 371b45d84..f6a2f7dd5 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -939,22 +939,21 @@ class rcube_sieve_script
             return;
         }
 
-        // relational operator + comparator
+        // relational operator
         if (preg_match('/^(value|count)-([gteqnl]{2})/', $test['type'], $m)) {
             array_push($exts, 'relational');
-            array_push($exts, 'comparator-i;ascii-numeric');
 
-            $out .= ' :' . $m[1] . ' "' . $m[2] . '" :comparator "i;ascii-numeric"';
+            $out .= ' :' . $m[1] . ' "' . $m[2];
         }
         else {
-            $this->add_comparator($test, $out, $exts);
-
             if ($test['type'] == 'regex') {
                 array_push($exts, 'regex');
             }
 
             $out .= ' :' . $test['type'];
         }
+
+        $this->add_comparator($test, $out, $exts);
     }
 
     /**