Use contact_search_name format in popup on results in compose contacts search

Conflicts:

	CHANGELOG
	program/steps/mail/search_contacts.inc
pull/6833/head
Aleksander Machniak 9 years ago
parent f85227358a
commit 72a09408e9

@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
===========================
- Searching in both contacts and groups when LDAP addressbook with group_filters option is used
- Use contact_search_name format in popup on results in compose contacts search
- Fix message list multi-select/deselect issue (#5219)
- Fix bug where contact search menu fields where always unchecked in Larry skin
- Fix XSS issue in href attribute on area tag (#5240)

@ -46,9 +46,6 @@ foreach ($sources as $s) {
continue;
}
// get records
$result = $source->list_records($afields);
while ($row = $result->next()) {
$row['sourceid'] = $s['id'];
$key = rcube_addressbook::compose_contact_key($row, $addr_sort_col);
@ -86,8 +83,10 @@ if (!empty($result) && $result->count > 0) {
foreach ($emails as $i => $email) {
$row_id = $row['ID'].'-'.$i;
$jsresult[$row_id] = format_email_recipient($email, $name);
$title = rcube_addressbook::compose_search_name($row, $email, $name);
$OUTPUT->command('add_contact_row', $row_id, array(
'contact' => html::a(array('title' => $email), rcube::Q($name ? $name : $email) .
'contact' => html::a(array('title' => $title), rcube::Q($name ? $name : $email) .
($name && count($emails) > 1 ? ' ' . html::span('email', rcube::Q($email)) : '')
)), 'person');
}

Loading…
Cancel
Save