summaryrefslogtreecommitdiff
path: root/program/steps/settings/edit_folder.inc
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-06-21 15:41:40 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-07-31 14:16:05 +0200
commitd1749659d25c5b68600aef3557284cedff8dded1 (patch)
treee3e9459679ec55dbfedb3531a60d814992eab9c9 /program/steps/settings/edit_folder.inc
parent057444bd415a3b0fef503f88f44d29b95e50d64d (diff)
Backported option to set default message list mode - default_list_mode (#1487312)
Diffstat (limited to 'program/steps/settings/edit_folder.inc')
-rw-r--r--program/steps/settings/edit_folder.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 6b7bd08d2..8ac51658c 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -163,8 +163,10 @@ function rcmail_folder_form($attrib)
$value = (int) $_POST['_viewmode'];
}
else if (strlen($mbox_imap)) {
- $a_threaded = $RCMAIL->config->get('message_threading', array());
- $value = (int) isset($a_threaded[$mbox_imap]);
+ $a_threaded = $RCMAIL->config->get('message_threading', array());
+ $default_mode = $RCMAIL->config->get('default_list_mode', 'list');
+
+ $value = (int) (isset($a_threaded[$mbox_imap]) ? $a_threaded[$mbox_imap] : $default_mode == 'threads');
}
$form['props']['fieldsets']['settings']['content']['viewmode'] = array(