summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-04-13 09:51:22 +0000
committerthomascube <thomas@roundcube.net>2011-04-13 09:51:22 +0000
commite5e1eb0195d2501920fb46651a144747750fc913 (patch)
tree6d1779012a1852d1f75ead80ad9bd8d8b2c2b658
parent3d8b54edf74792e3996d861a6a30c41d82976261 (diff)
Convert normalized latin-1 string back to utf8
-rw-r--r--program/include/rcube_addressbook.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index 8ec0abbf2..10477e8a1 100644
--- 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);