Fix bug where message parts with no Content-Disposition header and no…

… name were not listed on attachments list (#7117)
roundcube · Jan 18, 2020 · 3819e4e · 3819e4e
1 parent 62ed219
commit 3819e4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -17,6 +17,7 @@ CHANGELOG Roundcube Webmail
 - Fix unexpected error message when mail refresh involves folder auto-unsubscribe (#6923)
 - Fix recipient duplicates in print-view when the recipient list has been expanded (#7169)
 - Fix bug where files in skins/ directory were listed on skins list (#7180)
+- Fix bug where message parts with no Content-Disposition header and no name were not listed on attachments list (#7117)
 
 RELEASE 1.4.2
 -------------

diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
@@ -878,6 +878,13 @@ private function parse_structure($structure, $recursive = false)
 
                     $this->add_part($mail_part, 'attachment');
                 }
+                // Last resort, non-inline and non-text part of multipart/mixed message (#7117)
+                else if ($mimetype == 'multipart/mixed'
+                    && $mail_part->disposition != 'inline'
+                    && $primary_type && $primary_type != 'text' && $primary_type != 'multipart'
+                ) {
+                    $this->add_part($mail_part, 'attachment');
+                }
             }
 
             // if this is a related part try to resolve references