Fix the display of a subfolder "foo.inbox" aswell.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6662 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 2c07d6235ffee1cfe88f0f5c515c5856d4deb549..92ca4197c6a4ef506fc4792bdcf871da45cf5a27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Version 1.5.1 -- CVS
     as separate plugin.
   - Added Farsi and Tagalog translation support.
   - Enabled Ukrainian and Russian-Ukrainian support
     as separate plugin.
   - Added Farsi and Tagalog translation support.
   - Enabled Ukrainian and Russian-Ukrainian support

+  - Fix that subfolders named "foo.inbox" didn't always work well.

 
 
 Version 1.5.0
 
 
 Version 1.5.0

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 8d5b957e52c2da4dcd9e371dbe7ab92e642514d0..768cc8c2d0a83cd8b7714441039218a3cef14a19 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -979,7 +979,7 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) {
 }
 
 function sqimap_utf7_decode_mbx_tree(&$mbx_tree) {
 }
 
 function sqimap_utf7_decode_mbx_tree(&$mbx_tree) {

-   if (strtoupper($mbx_tree->mailboxname_sub) == 'INBOX')
+   if (strtoupper($mbx_tree->mailboxname_full) == 'INBOX')

        $mbx_tree->mailboxname_sub = _("INBOX");
    else
        $mbx_tree->mailboxname_sub = imap_utf7_decode_local($mbx_tree->mailboxname_sub);
        $mbx_tree->mailboxname_sub = _("INBOX");
    else
        $mbx_tree->mailboxname_sub = imap_utf7_decode_local($mbx_tree->mailboxname_sub);