Fix PHP warning in compressMessageSet() and clarify result on an empt…

…y input
roundcube · Nov 21, 2024 · 785e9bc · 785e9bc
1 parent c05d44c
commit 785e9bc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2062,7 +2062,7 @@ public function fetchHeaderIndex($mailbox, $message_set, $index_field = '', $ski
     {
         // Validate input
         if (is_array($message_set)) {
-            if (!($message_set = $this->compressMessageSet($message_set))) {
+            if (($message_set = $this->compressMessageSet($message_set)) === 'INVALID') {
                 return false;
             }
         } elseif (empty($message_set)) {
@@ -4042,7 +4042,7 @@ protected static function r_implode($element)
      * @param array|string $messages Message identifiers
      * @param bool         $force    Forces compression of any size
      *
-     * @return string Compressed sequence-set
+     * @return string Compressed sequence-set or 'INVALID' on invalid or empty input
      */
     public static function compressMessageSet($messages, $force = false)
     {
@@ -4063,6 +4063,10 @@ public static function compressMessageSet($messages, $force = false)
             $messages = explode(',', $messages);
         }
 
+        if (empty($messages)) {
+            return 'INVALID';
+        }
+
         sort($messages);
 
         $result = [];