more noselect fixes

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f0055440dcd22d707f2d607d2f6567ea4155e61e..b220ee6f6042818d0f4b56b9fc7957b30a1aa4d4 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -800,10 +800,14 @@ function sqimap_mailbox_tree($imap_stream) {
                            0 : sqimap_unseen_messages($imap_stream, $mbx);
                if ($unseen_type == 2 || ($move_to_trash 
                    && ($mbx == $trash_folder) )) {
-                   $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx);
+                    $sorted_lsub_ary[$i]['nummessages'] =
+                       $sorted_lsub_ary[$i]['noselect'] ?
+                           0 : sqimap_get_num_messages($imap_stream, $mbx);
                }
                if ($mbx == $trash_folder) {
-                   $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx);
+                    $sorted_lsub_ary[$i]['nummessages'] =
+                       $sorted_lsub_ary[$i]['noselect'] ?
+                           0 : sqimap_get_num_messages($imap_stream, $mbx);
                }           
            }
        }