Add INBOX to the list of folders only if no filter and no prefix was specified

10 years ago · 9fbabc4668
parent c67e7e8f85
commit 9fbabc4668
1 changed files with 2 additions and 2 deletions
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@ -2813,7 +2813,7 @@ class rcube_imap extends rcube_storage
        }

        // INBOX should always be available
-        if ((!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
+        if (!strlen($root) && (!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
            array_unshift($a_mboxes, 'INBOX');
        }

@ -2941,7 +2941,7 @@ class rcube_imap extends rcube_storage
        }

        // INBOX should always be available
-        if ((!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
+        if (!strlen($root) && (!$filter || $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
            array_unshift($a_mboxes, 'INBOX');
        }