diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-04 09:03:28 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-04 09:03:28 +0000 |
| commit | fd7c1eafde97108a05954ffe47b9ab54a24162ea (patch) | |
| tree | 491120f3fc8f75cdc18a0efa2d7fb3dcdc0343d8 /roundcubemail | |
| parent | 71e07bc5627d535e51e88c12a5ab2ca957ad5495 (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
git-svn-id: https://svn.roundcube.net/trunk@5306 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/edit_folder.inc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 5ed0568f4..bd06731e0 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/steps/settings/edit_folder.inc b/roundcubemail/program/steps/settings/edit_folder.inc index 740c05ee5..36a4b28ba 100644 --- a/roundcubemail/program/steps/settings/edit_folder.inc +++ b/roundcubemail/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 |