From 053538bf60e354a64664fb9a992cbbda37d70f76 Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 5 Mar 2012 19:59:07 +0000 Subject: - Merge r5966 from trunk (#1488375) --- program/steps/addressbook/search.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/steps/addressbook/search.inc') diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index 172286171..9415de4ee 100644 --- 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; } -- cgit v1.2.3