summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-11-14 20:11:13 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-11-14 20:11:13 +0100
commit596301c10bde5e98b6cfdde51be843ffbf087e8d (patch)
tree2d4c0a454109309bd7605f322b41100a7f6f3741
parent2af37485965d0fd0a121a0f23f821138ad1a5529 (diff)
Reset $part_orig_mimetype variable in for-loop. This avoids attachments along with message/rfc822 parts being listed twice
-rw-r--r--program/lib/Roundcube/rcube_message.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 9b662a286..278007610 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -529,8 +529,9 @@ class rcube_message
$part_mimetype = $mail_part->real_mimetype;
list($primary_type, $secondary_type) = explode('/', $part_mimetype);
}
- else
- $part_mimetype = $mail_part->mimetype;
+ else {
+ $part_mimetype = $part_orig_mimetype = $mail_part->mimetype;
+ }
// multipart/alternative
if ($primary_type == 'multipart') {