diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-04-08 06:21:43 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-04-08 06:21:43 +0000 |
| commit | 21dce91dd5035a2ae0f0faef9fc27a6f0b2951cb (patch) | |
| tree | da48ef11298494c666b1ac4074fc57662140632e /roundcubemail | |
| parent | 6598ea4ec898c0cebf7386c85bf0623738d3f422 (diff) | |
- Fix opening attachment marks message as read (#1485803)
git-svn-id: https://svn.roundcube.net/trunk@2377 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index e3742c2a5..23606e0e4 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix opening attachment marks message as read (#1485803) - Fix 'temp_dir' does not support relative path under Windows (#1484529) - Fix "Initialize Database" button missing from installer (#1485802) - Fix compose window doesn't fit 1024x768 window (#1485396) diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index 67a2b7b3c..394a190b0 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -2433,7 +2433,7 @@ function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts) { // format request foreach($parts as $part) - $peeks[] = "BODY[$part.MIME]"; + $peeks[] = "BODY.PEEK[$part.MIME]"; $request = "$key FETCH $id (" . implode(' ', $peeks) . ')'; @@ -2446,9 +2446,9 @@ function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts) { $line = iil_ReadLine($fp, 1000); $line = iil_MultLine($fp, $line); - if (preg_match('/BODY\[([0-9\.]+)\.MIME\]/', $line, $matches)) { + if (preg_match('/BODY\.PEEK\[([0-9\.]+)\.MIME\]/', $line, $matches)) { $idx = $matches[1]; - $result[$idx] = preg_replace('/^(\* '.$id.' FETCH \()?\s*BODY\['.$idx.'\.MIME\]\s+/', '', $line); + $result[$idx] = preg_replace('/^(\* '.$id.' FETCH \()?\s*BODY\.PEEK\['.$idx.'\.MIME\]\s+/', '', $line); $result[$idx] = trim($result[$idx], '"'); $result[$idx] = rtrim($result[$idx], "\t\r\n\0\x0B"); } |