summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-07 17:59:28 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-04-07 17:59:28 +0200
commitf5799df36bbb986f018515e32b0c17e4acb5957e (patch)
tree8dfc5b0bf2710029bddd9c73967f11cd6cdb2156 /program
parentbde3ba5e93f9b02ac8bd1d10e33fa65cc4da31c5 (diff)
Fix folder column display and message moving in multi-folder search mode
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index adf135695..fca75d57f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2689,7 +2689,7 @@ function rcube_webmail()
return this.folder_selector(obj, function(folder) { ref.command('move', folder); });
// exit if current or no mailbox specified
- if (!mbox || mbox == this.env.mailbox)
+ if (!mbox || (mbox == this.env.mailbox && (!this.env.search_request || this.env.search_scope == 'base')))
return;
var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});
@@ -6499,7 +6499,7 @@ function rcube_webmail()
this.env.status_col = n;
if (list) {
- list.hide_column('folder', this.env.coltypes.folder && this.env.coltypes.folder.hidden);
+ list.hide_column('folder', (this.env.coltypes.folder && this.env.coltypes.folder.hidden) || $.inArray('folder', this.env.listcols) < 0);
list.init_header();
}
};