diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-04-18 16:39:41 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-04-18 16:39:41 +0200 |
| commit | 26b5200322dbb1b52333f7e2db1c303ef0ace1f4 (patch) | |
| tree | 8bb9078d3af04968ac9ae70db64ca7aea70327eb /program/steps/mail/list.inc | |
| parent | 8087b13d20019b506b701bc8f5e5d6d2a0fa6a54 (diff) | |
Consider search scope (and changes) for filter searches + disable folder operation commands in multi-folder search mode (#1485234)
Diffstat (limited to 'program/steps/mail/list.inc')
| -rw-r--r-- | program/steps/mail/list.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index 36c79fb29..c4a6df57b 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -60,11 +60,12 @@ $RCMAIL->storage->folder_sync($mbox_name); // initialize searching result if search_filter is used if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { - $search_request = md5($mbox_name.$_SESSION['search_filter']); + $search_request = md5($mbox_name.$_SESSION['search_scope'].$_SESSION['search_filter']); $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column()); $_SESSION['search'] = $RCMAIL->storage->get_search_set(); $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); + $OUTPUT->set_env('search_filter', $_SESSION['search_filter']); } // fetch message headers |