summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-19 15:30:28 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-19 15:30:28 +0200
commit83f2f6bb6584fe15bd6834f161ccf2dc8c97ee77 (patch)
tree116e57290632a84c608fdf7fc6a05c1a3126abb3 /program
parentc96d3f57ef6a13e3e61338f57a473b4817547da8 (diff)
Display email address if contact has more than one (in compose address book widget)
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/list_contacts.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
index 7c99a1309..9347190da 100644
--- a/program/steps/mail/list_contacts.inc
+++ b/program/steps/mail/list_contacts.inc
@@ -69,11 +69,14 @@ if ($CONTACTS && $CONTACTS->ready) {
$name = rcube_addressbook::compose_list_name($row);
// add record for every email address of the contact
- foreach ($CONTACTS->get_col_values('email', $row, true) as $i => $email) {
+ $emails = $CONTACTS->get_col_values('email', $row, true);
+ foreach ($emails as $i => $email) {
$row_id = $row['ID'].$i;
$jsresult[$row_id] = format_email_recipient($email, $name);
$OUTPUT->command('add_contact_row', $row_id, array(
- 'contact' => html::span(array('title' => $email), Q($name ? $name : $email))), 'person');
+ 'contact' => html::span(array('title' => $email), Q($name ? $name : $email) .
+ ($name && count($emails) > 1 ? '&nbsp;' . html::span('email', Q($email)) : '')
+ )), 'person');
}
}
}