From 8cb3180b6631af708f6ed4c8be79fa1d895d7525 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 19 Nov 2008 17:16:43 +0000 Subject: - last change fix git-svn-id: https://svn.roundcube.net/trunk@2067 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/lib/imap.inc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'roundcubemail/program/lib') diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index 316980ca5..0f540dde5 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -2370,12 +2370,8 @@ function iil_C_UnSubscribe(&$conn, $folder) { function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $part) { - if (empty($part)) { - $part = 'HEADER'; - } else { - $part .= '.MIME'; - } - + $part = empty($part) ? 'HEADER' : $part.'.MIME'; + return iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, 1); } @@ -2388,10 +2384,10 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode, $file=NULL) { $fp = $conn->fp; $result = false; - if (($part == 0) || empty($part)) { + if (empty($part)) { $part = 'TEXT'; } - + if (iil_C_Select($conn, $mailbox)) { $reply_key = '* ' . $id; -- cgit v1.2.3