- Merge r5194 from trunk

3 files changed, 13 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c86ea1b20..dfe3d115f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix bug where message list filter was reset on folder compacting (#1488076)
+
+RELEASE 0.6-RC
+--------------
 - jQuery 1.6.3
 - Fallback to mail_domain in LDAP variable replacements; added 'host' to 'user_create' hook arguments (#1488024)
 - Fixed wrong vCard type parameter mobile (#1488067)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 1b311127c..dca8961fa 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -418,7 +418,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/program/js/app.js b/program/js/app.js
index dc7aa3de3..062eee2da 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -995,14 +995,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;
 
@@ -2795,14 +2795,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);