From b96ed4b74eac384057c519346c01f52ec0659608 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 04 Oct 2011 05:03:28 -0400
Subject: [PATCH] - 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
---
CHANGELOG | 1 +
program/steps/settings/edit_folder.inc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 5ed0568..bd06731 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 740c05e..36a4b28 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -134,7 +134,7 @@
);
// 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 @@
'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
--
Gitblit v1.9.1