diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-05-28 06:54:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-05-28 06:54:29 +0000 |
| commit | d387886cb336122660d6139c5a69697b4a1f0c6e (patch) | |
| tree | d090745920e3802c1d5ef45cdad31353891d321c | |
| parent | a492785f79b3d8430d1228402a74c7b67958b78c (diff) | |
- Fixed sorting of folders with non-ascii characters
git-svn-id: https://svn.roundcube.net/trunk@1444 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 936e37be0..f0cbe5b83 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/05/28 (alec) +---------- +- Fixed sorting of folders with non-ascii characters + 2008/05/21 (alec) ---------- - Localized pagetitle in Settings and Address Book diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 96e1d64cb..f742290d3 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -2502,13 +2502,15 @@ class rcube_imap if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p]) $a_defaults[$p] = $folder; else - $a_out[] = $folder; + { + $l_folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7')); + } } - natcasesort($a_out); + 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)); } /** |