summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-04-13 09:51:22 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-04-13 09:51:22 +0000
commitad168849b694462dcc68734fedd3e9e84da0e46d (patch)
tree8405bbbb8f02c7a7d4f6189cfb27cf474c5b295b /roundcubemail/program
parente7622fad720a972df1e9d5ec8a70af4cedc51597 (diff)
Convert normalized latin-1 string back to utf8
git-svn-id: https://svn.roundcube.net/trunk@4650 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_addressbook.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_addressbook.php b/roundcubemail/program/include/rcube_addressbook.php
index 8ec0abbf2..10477e8a1 100644
--- a/roundcubemail/program/include/rcube_addressbook.php
+++ b/roundcubemail/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);