Remove folder column after disabling multifolder scope (#1490022)

pull/210/head
Aleksander Machniak 10 years ago
parent b9d3e607bb
commit 371f7ca443

@ -384,13 +384,18 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null
$head_replace = true; $head_replace = true;
} }
// add 'folder' column to list on multi-folder searches $search_set = $RCMAIL->storage->get_search_set();
$search_set = $RCMAIL->storage->get_search_set();
$multifolder = $search_set && $search_set[1]->multi; $multifolder = $search_set && $search_set[1]->multi;
// add/remove 'folder' column to the list on multi-folder searches
if ($multifolder && !in_array('folder', $a_show_cols)) { if ($multifolder && !in_array('folder', $a_show_cols)) {
$a_show_cols[] = 'folder'; $a_show_cols[] = 'folder';
$head_replace = true; $head_replace = true;
} }
else if (!$multifolder && ($found = array_search('folder', $a_show_cols)) !== false) {
unset($a_show_cols[$found]);
$head_replace = true;
}
$mbox = $RCMAIL->storage->get_folder(); $mbox = $RCMAIL->storage->get_folder();
@ -402,6 +407,7 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null
// Make sure there are no duplicated columns (#1486999) // Make sure there are no duplicated columns (#1486999)
$a_show_cols = array_unique($a_show_cols); $a_show_cols = array_unique($a_show_cols);
$_SESSION['list_attrib']['columns'] = $a_show_cols;
// Plugins may set header's list_cols/list_flags and other rcube_message_header variables // Plugins may set header's list_cols/list_flags and other rcube_message_header variables
// and list columns // and list columns

Loading…
Cancel
Save