From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 16 Feb 2010 05:45:51 +0000 (-0700)
Subject: Fix mailbox sorting
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3fd8c930b8a63d1d55858ababeca4c4f138562c4;p=horde.git

Fix mailbox sorting
---

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index 8f8953807..663976f11 100644
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -1401,7 +1401,7 @@ class IMP_Imap_Tree
         /* Sort IMAP mailboxes. INBOX always occurs first. */
         natcasesort($basesort);
         unset($basesort['INBOX']);
-        $mbox = array('INBOX') + array_keys($basesort);
+        $mbox = array_merge(array('INBOX'), array_keys($basesort));
 
         /* Sort non-IMAP elements. */
         if (!empty($othersort)) {