Convert normalized latin-1 string back to utf8

13 years ago · e5e1eb0195
parent 3d8b54edf7
commit e5e1eb0195
1 changed files with 2 additions and 2 deletions
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@ -405,10 +405,10 @@ abstract class rcube_addressbook
        
        foreach ($arr as $i => $part) {
            if (utf8_encode(utf8_decode($part)) == $part) {  // is latin-1 ?
-                $arr[$i] = strtr(strtolower(strtr(utf8_decode($part),
+                $arr[$i] = utf8_encode(strtr(strtolower(strtr(utf8_decode($part),
                    'ÇçäâàåéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ',
                    'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')),
-                    array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u'));
+                    array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')));
            }
            else
                $arr[$i] = strtolower($part);