Fix bug where "with attachment" filter could fail on some fts engines (…

…#9514)
roundcube · Jul 21, 2024 · 7b68ad1 · 7b68ad1
1 parent 8f9f1f1
commit 7b68ad1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - Fix decoding mail parts with multiple base64-encoded text blocks (#9290)
 - Fix bug where some messages could get malformed in an import from a MBOX file (#9510)
 - Fix invalid line break characters in multi-line text in Sieve scripts (#9543)
+- Fix bug where "with attachment" filter could fail on some fts engines (#9514)
 
 ## Release 1.6.7
 

diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php
@@ -1558,7 +1558,7 @@ public static function search_filter($attrib)
 
         // Content-Type values of messages with attachments
         // the same as in app.js:add_message_row()
-        $ctypes = ['application/', 'multipart/m', 'multipart/signed', 'multipart/report'];
+        $ctypes = ['application/', 'multipart/mixed', 'multipart/signed', 'multipart/report'];
 
         // Build search string of "with attachment" filter
         $attachment = trim(str_repeat(' OR', count($ctypes) - 1));

diff --git a/program/actions/mail/search.php b/program/actions/mail/search.php
@@ -360,7 +360,7 @@ protected static function search_input_option($option, $value)
                 if ($value == 'attachment') {
                     // Content-Type values of messages with attachments
                     // the same as in app.js:add_message_row()
-                    $ctypes = ['application/', 'multipart/m', 'multipart/signed', 'multipart/report'];
+                    $ctypes = ['application/', 'multipart/mixed', 'multipart/signed', 'multipart/report'];
 
                     // Build search string of "with attachment" filter
                     $result = str_repeat(' OR', count($ctypes) - 1);