[Svn] r4650 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Wed Apr 13 11:51:22 CEST 2011


Author: thomasb
Date: 2011-04-13 04:51:22 -0500 (Wed, 13 Apr 2011)
New Revision: 4650

Modified:
   trunk/roundcubemail/program/include/rcube_addressbook.php
Log:
Convert normalized latin-1 string back to utf8

Modified: trunk/roundcubemail/program/include/rcube_addressbook.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_addressbook.php	2011-04-12 18:05:36 UTC (rev 4649)
+++ trunk/roundcubemail/program/include/rcube_addressbook.php	2011-04-13 09:51:22 UTC (rev 4650)
@@ -405,10 +405,10 @@
         
         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);

-------------- next part --------------
_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn


More information about the Svn mailing list