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

9 years ago · 6521c20768
parent 3b36bcfb68
commit 6521c20768
1 changed files with 2 additions and 2 deletions
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@ -2811,7 +2811,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');
        }

@ -2942,7 +2942,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');
        }