Changeset a446829 in github

Timestamp:

Apr 15, 2010 8:21:03 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a4c163f

Parents:

633a106

Message:

• fix sorting of folders with capital letters

File:

• program/include/rcube_imap.php (modified) (3 diffs)

program/include/rcube_imap.php

@@ -2542 +2542 @@
     function list_unsubscribed($root='')
     {
-        static $sa_unsubscribed;
-    
-        if (is_array($sa_unsubscribed))
-            return $sa_unsubscribed;
+        static $a_folders;
+    
+        if (is_array($a_folders))
+            return $a_folders;
       
         // retrieve list of folders from IMAP server
@@ -2552 +2552 @@
         // modify names with root dir
         foreach ($a_mboxes as $mbox_name) {
-            $name = $this->mod_mailbox($mbox_name, 'out');
-            if (strlen($name))
+            if ($name = $this->mod_mailbox($mbox_name, 'out'))
                 $a_folders[] = $name;
         }
 
         // filter folders and sort them
-        $sa_unsubscribed = $this->_sort_mailbox_list($a_folders);
-        return $sa_unsubscribed;
+        $a_folders = $this->_sort_mailbox_list($a_folders);
+        return $a_folders;
     }
 
@@ -3534 +3533 @@
                 $a_defaults[$p] = $folder;
             else
-                $folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP'));
+                $folders[$folder] = rcube_charset_convert($folder, 'UTF7-IMAP');
         }