From e5e1eb0195d2501920fb46651a144747750fc913 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Apr 2011 09:51:22 +0000
Subject: Convert normalized latin-1 string back to utf8

---
 program/include/rcube_addressbook.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program/include')

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);
-- 
cgit v1.2.3