- don't call FETCH for empty (size=0) message parts

release-0.6
alecpl 17 years ago
parent d4436e7861
commit 3b7e00fbda

@ -987,7 +987,7 @@ function rcmail_message_body($attrib)
{ {
if ($part->type == 'headers') if ($part->type == 'headers')
$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers); $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
else if ($part->type == 'content') else if ($part->type == 'content' && $part->size)
{ {
if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset'])) if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset']))
$part->ctype_parameters['charset'] = $MESSAGE->headers->charset; $part->ctype_parameters['charset'] = $MESSAGE->headers->charset;

@ -113,7 +113,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
// turn off output buffering and print part content // turn off output buffering and print part content
if ($part->body) if ($part->body)
echo $part->body; echo $part->body;
else else if ($part->size)
$IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true); $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
} }

Loading…
Cancel
Save