Fix regression in compressMessageSet() (#6235)

roundcube · Apr 6, 2018 · dc9c9c3 · dc9c9c3
1 parent e57c66f
commit dc9c9c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
@@ -3878,16 +3878,15 @@ public static function compressMessageSet($messages, $force=false)
     {
         // given a comma delimited list of independent mid's,
         // compresses by grouping sequences together
-
         if (!is_array($messages)) {
             // if less than 255 bytes long, let's not bother
             if (!$force && strlen($messages) < 255) {
-                return preg_match('/[^0-9:,]/', $messages) ? 'INVALID' : $messages;
+                return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
             }
 
             // see if it's already been compressed
             if (strpos($messages, ':') !== false) {
-                return preg_match('/[^0-9:,]/', $messages) ? 'INVALID' : $messages;
+                return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
             }
 
             // separate, then sort
@@ -3924,7 +3923,7 @@ public static function compressMessageSet($messages, $force=false)
         // return as comma separated string
         $result = implode(',', $result);
 
-        return preg_match('/[^0-9:,]/', $result) ? 'INVALID' : $result;
+        return preg_match('/[^0-9:,*]/', $result) ? 'INVALID' : $result;
     }
 
     /**