Fix mailbox sorting

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index 8f89538..663976f 100644 (file)
--- 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)) {