From df0da2e059ac7d12f5fbd4735a66736b2efdf61d Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 2 Feb 2008 19:41:32 +0000 Subject: Simplified fix for remembering searches when viewing message + Don't ask for MDN confirmations on drafted messages (#1484691) --- program/include/rcube_imap.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'program/include') diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc index 091048a15..1f94adcd1 100644 --- a/program/include/rcube_imap.inc +++ b/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])) -- cgit v1.2.3