fixed double folder problem

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

diff --git a/ChangeLog b/ChangeLog
index cd62dc0e9f8c06a10da3596bd55186db54ddffd9..8bfd0db84cda457fea6193a1608626d49a39dc77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 0.5pre2 -- DEVELOPMENT
 ------------------------------
+- Fixed double folder problem on some servers
 - Using encryption for passwords
 - Added a patch from Bill Thousand to allow easier virtual domains
 - Security updates with attachments

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 422638ed3193150b8a06adb94ac9cfce9ade72ad..26d05d109c9bd9c068e3a3e5340782c3bd1ed5b1 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -169,6 +169,13 @@
          if ($sorted_lsub_ary[$i] == "INBOX")
             $inbox_subscribed = true;
       }
+      $new_ary = array();
+      for ($i=0; $i < count($sorted_lsub_ary); $i++) {
+         if (!in_array($sorted_lsub_ary[$i], $new_ary)) {
+            $new_ary[] = $sorted_lsub_ary[$i];
+         }
+      }
+      $sorted_lsub_ary = $new_ary;
       if (isset($sorted_lsub_ary)) {
          sort($sorted_lsub_ary);
       }