summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-10-04 09:03:28 +0000
committeralecpl <alec@alec.pl>2011-10-04 09:03:28 +0000
commitb96ed4b74eac384057c519346c01f52ec0659608 (patch)
treec7853d2df5963860491aa8f52df9dbe4fbcb51ed
parent130cdcf7d0d0389a0c7653d25397fb5f4ddf5877 (diff)
- Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#1488107), also show messages count and size in such case
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/settings/edit_folder.inc4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5ed0568f4..bd06731e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#1488107)
- Fix namespace handling in special folders settings (#1488112)
- Disable time limit for CLI scripts (#1488109)
- Fix misleading display when chaning editor type (#1488104)
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 740c05ee5..36a4b28ba 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -134,7 +134,7 @@ function rcmail_folder_form($attrib)
);
// Settings: threading
- if ($threading_supported && !$options['noselect'] && !$options['is_root']) {
+ if ($threading_supported && ($mbox_imap == 'INBOX' || (!$options['noselect'] && !$options['is_root']))) {
$select = new html_select(array('name' => '_viewmode', 'id' => '_listmode'));
$select->add(rcube_label('list'), 0);
$select->add(rcube_label('threads'), 1);
@@ -191,7 +191,7 @@ function rcmail_folder_form($attrib)
'content' => array()
);
- if (!$options['noselect'] && !$options['is_root']) {
+ if ((!$options['noselect'] && !$options['is_root']) || $mbox_imap == 'INBOX') {
$msgcount = $RCMAIL->imap->messagecount($mbox_imap, 'ALL', true, false);
// Size