From d96dc639fce2c2e3d1745dacd64a38dbf2bfd4a5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 08 Sep 2011 11:16:56 -0400
Subject: [PATCH] - Merge r5194 from trunk
---
CHANGELOG | 4 ++++
program/include/rcube_imap.php | 2 +-
program/js/app.js | 15 ++++++++-------
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c86ea1b..dfe3d11 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 1b31112..dca8961 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -418,7 +418,7 @@
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 dc7aa3d..062eee2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -995,14 +995,14 @@
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 @@
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);
--
Gitblit v1.9.1