diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 19:41:32 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-02 19:41:32 +0000 |
| commit | 147a0ce90af35c05bea0cb07bcf3ef7030428962 (patch) | |
| tree | c802ade70e10b64d4d4d2846a2a2a283b6828c59 /roundcubemail/program/include/rcube_imap.inc | |
| parent | 2e56ccfbb0ed1acc16dd452f4cbf4210ec26f449 (diff) | |
Simplified fix for remembering searches when viewing message + Don't ask for MDN confirmations on drafted messages (#1484691)
git-svn-id: https://svn.roundcube.net/trunk@996 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_imap.inc')
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc index 091048a15..1f94adcd1 100644 --- a/roundcubemail/program/include/rcube_imap.inc +++ b/roundcubemail/program/include/rcube_imap.inc @@ -761,7 +761,17 @@ class rcube_imap $this->_set_sort_order($sort_field, $sort_order); $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox; - $key = "$mbox:".$this->sort_field.":".$this->sort_order.".msgi"; + $key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.msgi"; + + // we have a saved search result. get index from there + if (!isset($this->cache[$key]) && $this->search_string && $mailbox == $this->mailbox) + { + $this->cache[$key] = $a_msg_headers = array(); + $this->_fetch_headers($mailbox, join(',', $this->search_set), $a_msg_headers, NULL); + + foreach (iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order) as $i => $msg) + $this->cache[$key][] = $msg->uid; + } // have stored it in RAM if (isset($this->cache[$key])) |