From f08ba804a8edd0d456804fc7e17fe7a4cecc6776 Mon Sep 17 00:00:00 2001 From: alex-brainstorm Date: Fri, 4 Jul 2003 22:06:13 +0000 Subject: [PATCH] fix mailbox list (noselect and array_values) git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5215 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_mailbox.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php index 223456d9..d623e148 100755 --- a/functions/imap_mailbox.php +++ b/functions/imap_mailbox.php @@ -538,8 +538,8 @@ function sqimap_mailbox_list($imap_stream) { $inbox_subscribed = true; } } - /* remove duplicates */ - $sorted_lsub_ary = array_unique($sorted_lsub_ary); + /* remove duplicates and ensure array is contiguous, so we don't rely on sort()' side-effect that fails if count()==1 */ + $sorted_lsub_ary = array_values(array_unique($sorted_lsub_ary)); /* natural sort mailboxes */ if (isset($sorted_lsub_ary)) { @@ -718,6 +718,7 @@ function sqimap_mailbox_tree($imap_stream) { $inbox_in_list = false; $inbox_subscribed = false; + $noselect = false; require_once(SM_PATH . 'include/load_prefs.php'); -- 2.25.1