Imported Upstream version 0.7.2

[roundcube.git] / program / steps / addressbook / search.inc

diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 1722861716ed797af841b8b28d21da3a392149f7..9415de4ee60069273c0547ff1a24f3ddc1701335 100644 (file)
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -144,6 +144,7 @@ function rcmail_contact_search()
     $sources    = $RCMAIL->get_address_sources();
     $search_set = array();
     $records    = array();
+    $sort_col   = $RCMAIL->config->get('addressbook_sort_col', 'name');
 
     foreach ($sources as $s) {
         $source = $RCMAIL->get_address_book($s['id']);
@@ -182,7 +183,7 @@ function rcmail_contact_search()
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s['id'];
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }