diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-08 14:45:26 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-08 14:45:26 +0000 |
| commit | fcfcaa4cf069c1ce1be5e1d2674cd47a80493cdc (patch) | |
| tree | b9938ee1c2c0500fdaf945267e6dfbaf5b40e67c /roundcubemail | |
| parent | 82610b112849c4dccbef2ccd4fc6627da62bed07 (diff) | |
- Fix compacting folder resets message list filter (#1488076)
- Fix reset-search action so it resets list page number to 1
git-svn-id: https://svn.roundcube.net/trunk@5194 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 15 |
3 files changed, 10 insertions, 8 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 2009c7e93..1a301f469 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix compacting folder resets message list filter (#1488076) - Fix displaying multipart/alternative messages with only one part (#1487938) - Rewritten messages caching: Indexes are stored in a separate table, so there's no need to store all messages in a folder diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index d14a643de..dfbee76c0 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -426,7 +426,7 @@ class rcube_imap function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null, $threads=false, $sorted=false) { if (is_array($str) && $msgs == null) - list($str, $msgs, $charset, $sort_field, $threads) = $str; + list($str, $msgs, $charset, $sort_field, $threads, $sorted) = $str; if ($msgs === false) $msgs = array(); else if ($msgs != null && !is_array($msgs)) diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 002f345ee..423361195 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -990,14 +990,14 @@ function rcube_webmail() this.select_all_mode = false; if (s && this.env.mailbox) - this.list_mailbox(this.env.mailbox); + this.list_mailbox(this.env.mailbox, 1); else if (s && this.task == 'addressbook') { if (this.env.source == '') { for (n in this.env.address_sources) break; this.env.source = n; this.env.group = ''; } - this.list_contacts(this.env.source, this.env.group); + this.list_contacts(this.env.source, this.env.group, 1); } break; @@ -2797,14 +2797,15 @@ function rcube_webmail() this.expunge_mailbox = function(mbox) { - var lock = false, - url = '_mbox='+urlencode(mbox); + var lock, url = '_mbox='+urlencode(mbox); // lock interface if it's the active mailbox if (mbox == this.env.mailbox) { - lock = this.set_busy(true, 'loading'); - url += '&_reload=1'; - } + lock = this.set_busy(true, 'loading'); + url += '&_reload=1'; + if (this.env.search_request) + url += '&_search='+this.env.search_request; + } // send request to server this.http_post('expunge', url, lock); |