diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-28 09:26:19 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-28 09:26:19 +0000 |
| commit | d919aaf34d6a3fa6c224dbd6c307d8f5a74eeb97 (patch) | |
| tree | 17ad9cf05ab09fe237dbbcba97da6271587f09d9 | |
| parent | dff99c7987c75c32b351f34d4ff618a02b883805 (diff) | |
- Fix handling of INBOX's subfolders in special folders config (#1488279)
git-svn-id: https://svn.roundcube.net/trunk@5659 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 36eae2f58..9f8f6cc7b 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix handling of INBOX's subfolders in special folders config (#1488279) - Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274) - Fix crashes with eAccelerator (#1488256) - Fix searching on IMAP servers without CHARSET specifier support (#1488271) diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index ac55acb3a..f4517ccaa 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -704,8 +704,15 @@ function rcmail_user_prefs($current=null) // load folders list only when needed if ($current) { - $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, - 'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w')); + $select = rcmail_mailbox_select(array( + 'noselection' => '---', + 'realnames' => true, + 'maxlength' => 30, + 'folder_filter' => 'mail', + 'folder_rights' => 'w', + // #1486114, #1488279 + 'onchange' => "if ($(this).val() == 'INBOX') $(this).val('')", + )); } else // dummy select $select = new html_select(); |