sqimap_utf7_decode_mbx_tree doesn't issue a return, but simply changes

the variables by reference to the call.  This makes mbxs_tree an undefined
and unusued variable and might cause errors in php 4.4+ (especially with
objects).

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

diff --git a/ChangeLog b/ChangeLog
index f39db56d4e2274449103215c002f1551cb0da5a5..0a7a41f3e05fce78e37359d9e68f3b3177d829a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -473,6 +473,8 @@ Version 1.5.1 -- CVS
   - Undefined variable in rare case in view_header.php
   - Variable by reference fix in printer_friendly_bottom.php.
   - Undefined index in addressbook backends.
+  - sqimap_utf7_decode_mbx_tree returns variables by reference, rather than a 
+    return value (#1351822)
 
 
 Version 1.5.0 - 2 February 2004

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index b0bd3f0bc0a952180a1d480d88f1391e3876fdb4..a1a00fa20add70cf9fada4e38ace996f8e59fc53 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -1105,6 +1105,7 @@ function sqimap_fill_mailbox_tree($mbx_ary, $mbxs=false,$imap_stream) {
  * @since 1.5.0
  */
 function sqimap_utf7_decode_mbx_tree(&$mbx_tree) {
+
    if (strtoupper($mbx_tree->mailboxname_full) == 'INBOX')
        $mbx_tree->mailboxname_sub = _("INBOX");
    else
@@ -1112,7 +1113,7 @@ function sqimap_utf7_decode_mbx_tree(&$mbx_tree) {
    if ($mbx_tree->mbxs) {
       $iCnt = count($mbx_tree->mbxs);
       for ($i=0;$i<$iCnt;++$i) {
-          $mbxs_tree->mbxs[$i] = sqimap_utf7_decode_mbx_tree($mbx_tree->mbxs[$i]);
+            sqimap_utf7_decode_mbx_tree($mbx_tree->mbxs[$i]);
       }
    }
 }
@@ -1252,4 +1253,4 @@ function sqimap_mailbox_is_noinferiors($oImapStream,$sImapFolder,&$oBoxes) {
     return false;
 }
 
-?>
\ No newline at end of file
+?>