diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/lib/Roundcube/rcube_imap_cache.php | 10 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_message.php | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/program/lib/Roundcube/rcube_imap_cache.php b/program/lib/Roundcube/rcube_imap_cache.php index e49e77803..4b263b1f0 100644 --- a/program/lib/Roundcube/rcube_imap_cache.php +++ b/program/lib/Roundcube/rcube_imap_cache.php @@ -1235,13 +1235,15 @@ class rcube_imap_cache private function message_object_prepare(&$msg, &$size = 0) { // Remove body too big - if ($msg->body && ($length = strlen($msg->body))) { - $size += $length; + if (isset($msg->body)) { + $length = strlen($msg->body); - if ($size > $this->threshold * 1024) { - $size -= $length; + if ($msg->body_modified || $size + $length > $this->threshold * 1024) { unset($msg->body); } + else { + $size += $length; + } } // Fix mimetype which might be broken by some code when message is displayed diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index f24ec3ed8..c5ea3dac1 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -769,16 +769,12 @@ class rcube_message $uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n/s'; if (preg_match_all($uu_regexp, $part->body, $matches, PREG_SET_ORDER)) { - // update message content-type - $part->ctype_primary = 'multipart'; - $part->ctype_secondary = 'mixed'; - $part->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary; $uu_endstring = "`\nend\n"; // add attachments to the structure foreach ($matches as $pid => $att) { $startpos = strpos($part->body, $att[1]) + strlen($att[1]) + 1; // "\n" - $endpos = strpos($part->body, $uu_endstring); + $endpos = strpos($part->body, $uu_endstring); $filebody = substr($part->body, $startpos, $endpos-$startpos); // remove attachments bodies from the message body @@ -802,6 +798,8 @@ class rcube_message // remove attachments bodies from the message body $part->body = preg_replace($uu_regexp, '', $part->body); + // mark body as modified so it will not be cached by rcube_imap_cache + $part->body_modified = true; } return $parts; |