From d387886cb336122660d6139c5a69697b4a1f0c6e Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 28 May 2008 06:54:29 +0000 Subject: - Fixed sorting of folders with non-ascii characters git-svn-id: https://svn.roundcube.net/trunk@1444 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'roundcubemail/program/include') 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)); } /** -- cgit v1.2.3