Changeset 1444 in subversion

Timestamp:

May 28, 2008 2:54:29 AM (5 years ago)

Author:

alec

Message:

• Fixed sorting of folders with non-ascii characters

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/05/28 (alec)
+----------
+- Fixed sorting of folders with non-ascii characters
 
 2008/05/21 (alec)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2503 +2503 @@
         $a_defaults[$p] = $folder;
       else
-        $a_out[] = $folder;
-      }
-
-    natcasesort($a_out);
+        {
+        $l_folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7'));
+        }
+      }
+
+    asort($l_folders, SORT_LOCALE_STRING);
     ksort($a_defaults);
-    
-    return array_merge($a_defaults, $a_out);
+
+    return array_merge($a_defaults, array_keys($l_folders));
     }