Changeset 2377 in subversion

Timestamp:

Apr 8, 2009 2:21:43 AM (4 years ago)

Author:

alec

Message:

• Fix opening attachment marks message as read (#1485803)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

trunk/roundcubemail/program/lib/imap.inc

@@ -2434 +2434 @@
         // format request
         foreach($parts as $part)
-                $peeks[] = "BODY[$part.MIME]";
+                $peeks[] = "BODY.PEEK[$part.MIME]";
         
         $request = "$key FETCH $id (" . implode(' ', $peeks) . ')';
@@ -2447 +2447 @@
                 $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");