diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-04-08 19:11:12 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-04-08 19:11:12 +0200 |
| commit | 188247894f6aff3a11f68bbdf94626b8bf58b852 (patch) | |
| tree | b6997429e9b4d1bdf787dbfdf3e29cdbc72cf5db /program/lib | |
| parent | 05e3d11554f751ed6a614abe343141aa1e6ea6da (diff) | |
Make multi-folder message identifiers work with folders containing commas
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube_imap.php | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_message.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index a2f610a0a..5c30327a1 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -1712,7 +1712,7 @@ class rcube_imap extends rcube_storage } // decode combined UID-folder identifier - if (preg_match('/^\d+-[^,]+$/', $uid)) { + if (preg_match('/^\d+-.+/', $uid)) { list($uid, $folder) = explode('-', $uid, 2); } @@ -1748,7 +1748,7 @@ class rcube_imap extends rcube_storage } // decode combined UID-folder identifier - if (preg_match('/^\d+-[^,]+$/', $uid)) { + if (preg_match('/^\d+-.+/', $uid)) { list($uid, $folder) = explode('-', $uid, 2); } diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index edfd339d8..a648ae722 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -75,7 +75,7 @@ class rcube_message function __construct($uid, $folder = null) { // decode combined UID-folder identifier - if (preg_match('/^\d+-[^,]+$/', $uid)) { + if (preg_match('/^\d+-.+/', $uid)) { list($uid, $folder) = explode('-', $uid, 2); } |