Fixes for bugs #1019185 and #1017941

global variable $boxesnew was being corrupted by another function (I don't really see why its even global at this point, its also stored in the Session).  Changed the name of the variable used in the offending function.  The symptoms were that the folder list boxes would not be populated, errors when emptying the trash, and errors in the Folders Options.

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 4faef27bd36a3fef123a1ac50f000a1a665ffcae..56883236e6e4ef334d46a0e90cd5c0944d5d2e2a 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -749,7 +749,7 @@ function sqimap_mailbox_list_all($imap_stream) {
 }
 
 function sqimap_mailbox_tree($imap_stream) {
-    global $boxesnew, $default_folder_prefix, $unseen_notify, $unseen_type;
+    global $default_folder_prefix, $unseen_notify, $unseen_type;
     if (true) {
 
         global $data_dir, $username, $list_special_folders_first,
@@ -848,8 +848,8 @@ function sqimap_mailbox_tree($imap_stream) {
        }
        $sorted_lsub_ary = array_values($sorted_lsub_ary);
        array_multisort($sorted_lsub_ary, SORT_ASC, SORT_REGULAR);
-       $boxesnew = sqimap_fill_mailbox_tree($sorted_lsub_ary,false,$imap_stream);
-       return $boxesnew;
+       $boxestree = sqimap_fill_mailbox_tree($sorted_lsub_ary,false,$imap_stream);
+       return $boxestree;
     }
 }