Sorry, a bug slipped into the CVS.

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index f244876e9ef4d14a89710e2168bb4c551aa407dc..a0d29cd4037c503eae0a14fd4a628a5659ba6a22 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -11,9 +11,6 @@
       return;
    define ('imap_mailbox_php', true);
 
-   require_once('../src/load_prefs.php');
-   require_once('../functions/array.php');
-
    /******************************************************************************
     **  Expunges a mailbox 
     ******************************************************************************/
@@ -213,7 +210,8 @@
       $inbox_in_list = false;
       $inbox_subscribed = false;
 
-
+      require_once('../src/load_prefs.php');
+      require_once('../functions/array.php');
 
       $dm = sqimap_get_delimiter ($imap_stream);
 
@@ -360,6 +358,9 @@
    function sqimap_mailbox_list_all ($imap_stream) {
       global $list_special_folders_first, $folder_prefix;
       
+      if (!function_exists ("ary_sort"))
+         include_once('../functions/array.php');
+      
       $dm = sqimap_get_delimiter ($imap_stream);
 
       fputs ($imap_stream, "a001 LIST \"$folder_prefix\" *\r\n");