diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_imap.php | 12 |
2 files changed, 9 insertions, 4 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix cache (in)validation after setting \Deleted flag - Fix keybord events on messages list in opera browser (#1488823) - Fix selection of collapsed thread rows (#1488772) - Always save drafts with format=flowed in order to keep original line wraps (#1488799) diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index 9054b6bab..4e0d2225c 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -2188,10 +2188,10 @@ class rcube_imap extends rcube_storage $result = $this->conn->flag($folder, $uids, $flag); } - if ($result) { + if ($result && !$skip_cache) { // reload message headers if cached - // @TODO: update flags instead removing from cache - if (!$skip_cache && ($mcache = $this->get_mcache_engine())) { + // update flags instead removing from cache + if ($mcache = $this->get_mcache_engine()) { $status = strpos($flag, 'UN') !== 0; $mflag = preg_replace('/^UN/', '', $flag); $mcache->change_flag($folder, $all_mode ? null : explode(',', $uids), @@ -2203,8 +2203,12 @@ class rcube_imap extends rcube_storage $this->clear_messagecount($folder, 'SEEN'); $this->clear_messagecount($folder, 'UNSEEN'); } - else if ($flag == 'DELETED') { + else if ($flag == 'DELETED' || $flag == 'UNDELETED') { $this->clear_messagecount($folder, 'DELETED'); + // remove cached messages + if ($this->options['skip_deleted']) { + $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids)); + } } } |