From 94d8fb5a42899377804e42a3084845d034563167 Mon Sep 17 00:00:00 2001
From: David Carter <dpc22@cam.ac.uk>
Date: Sun, 16 Nov 2014 08:41:28 -0500
Subject: [PATCH] The following: program/steps/mail/compose.inc :: rcmail_store_target_selection() program/steps/settings/edit_folder.inc :: rcmail_folder_form()
---
program/steps/settings/edit_folder.inc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index fc6b2cd..5b37698 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -134,11 +134,11 @@
$select = $RCMAIL->folder_selector(array(
'name' => '_parent',
'noselection' => '---',
- 'realnames' => false,
'maxlength' => 150,
'unsubscribed' => true,
'skip_noinferiors' => true,
'exceptions' => $exceptions,
+ 'additional' => strlen($selected) ? array($selected) : null,
));
$form['props']['fieldsets']['location']['content']['path'] = array(
@@ -162,8 +162,10 @@
$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(
--
Gitblit v1.9.1