diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-19 19:15:40 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-19 19:15:40 +0000 |
| commit | 1003ca2062468296ece424db3f4cf5da16072931 (patch) | |
| tree | 5daad383b717dbc79f91daac73074358b78cf3e5 /roundcubemail/program/steps/mail | |
| parent | 4919a205af1f6ef8958495dba3d6f9ded6d3b4ce (diff) | |
- don't call FETCH for empty (size=0) message parts
git-svn-id: https://svn.roundcube.net/trunk@2770 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index a942c1a44..448663519 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -987,7 +987,7 @@ function rcmail_message_body($attrib) { if ($part->type == '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'])) $part->ctype_parameters['charset'] = $MESSAGE->headers->charset; diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index cf66914d7..f86c152c6 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/program/steps/mail/get.inc @@ -113,7 +113,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) { // turn off output buffering and print part content if ($part->body) echo $part->body; - else + else if ($part->size) $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true); } |