plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_cache_contact.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bc1164e943b420e52d286e03b6babd9efd67da6e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Feb 10 14:10:36 2014 +0100

    Remove non-unicode characters from sort cols

diff --git a/plugins/libkolab/lib/kolab_storage_cache_contact.php b/plugins/libkolab/lib/kolab_storage_cache_contact.php
index fde27bc..b70b37f 100644
--- a/plugins/libkolab/lib/kolab_storage_cache_contact.php
+++ b/plugins/libkolab/lib/kolab_storage_cache_contact.php
@@ -41,10 +41,10 @@ class kolab_storage_cache_contact extends kolab_storage_cache
         $sql_data['type'] = $object['_type'];
 
         // columns for sorting
-        $sql_data['name']      = $object['name'] . $object['prefix'];
-        $sql_data['firstname'] = $object['firstname'] . $object['middlename'] . $object['surname'];
-        $sql_data['surname']   = $object['surname']   . $object['firstname']  . $object['middlename'];
-        $sql_data['email']     = is_array($object['email']) ? $object['email'][0] : $object['email'];
+        $sql_data['name']      = rcube_charset::clean($object['name'] . $object['prefix']);
+        $sql_data['firstname'] = rcube_charset::clean($object['firstname'] . $object['middlename'] . $object['surname']);
+        $sql_data['surname']   = rcube_charset::clean($object['surname']   . $object['firstname']  . $object['middlename']);
+        $sql_data['email']     = rcube_charset::clean(is_array($object['email']) ? $object['email'][0] : $object['email']);
 
         if (is_array($sql_data['email'])) {
             $sql_data['email'] = $sql_data['email']['address'];