diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-02 17:33:51 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-03-02 17:33:51 +0000 |
| commit | bf978ceb2ad1dcd8a5a42ed37893dcf59e646098 (patch) | |
| tree | 2df538630ac93ef1ac6ed13c9ccd1eaf295eca37 /roundcubemail/program/include/rcube_imap.php | |
| parent | 9f0a8708f64468d0a978beeb3dab7e46e7cedabd (diff) | |
No more case-insensitive folder name comparisons
git-svn-id: https://svn.roundcube.net/trunk@3304 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_imap.php')
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index fdf524d30..e485226f8 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -56,7 +56,6 @@ class rcube_imap var $default_charset = 'ISO-8859-1'; var $struct_charset = NULL; var $default_folders = array('INBOX'); - var $default_folders_lc = array('inbox'); var $fetch_add_headers = ''; var $cache = array(); var $cache_keys = array(); @@ -242,15 +241,10 @@ class rcube_imap if (is_array($arr)) { $this->default_folders = $arr; - $this->default_folders_lc = array(); // add inbox if not included if (!in_array_nocase('INBOX', $this->default_folders)) array_unshift($this->default_folders, 'INBOX'); - - // create a second list with lower cased names - foreach ($this->default_folders as $mbox) - $this->default_folders_lc[] = strtolower($mbox); } } @@ -2947,7 +2941,7 @@ class rcube_imap if ($folder{0}=='.') continue; - if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p]) + if (($p = array_search($folder, $this->default_folders)) !== false && !$a_defaults[$p]) $a_defaults[$p] = $folder; else $folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP')); |
