summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-03-06 13:18:07 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-03-06 13:18:07 +0100
commit5ba53819cfd4ebfa25dd6a416b663c2c5748d8eb (patch)
tree71ea38b5752f98d5c598f8e0032ad6329e41ef3a /program/steps/mail
parent881d6b037507b9d01b267dd600f8977ac361100c (diff)
Revert "Support structured data for autocompletion results; map 'type' attribute to CSS class for autocomplete list items"
This reverts commit e3773d46cb4f06aaab2747db98765edd6d871524.
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/autocomplete.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 20cf94084..c15de92cf 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -90,7 +90,7 @@ if (!empty($book_types) && strlen($search)) {
// skip duplicates
if (!in_array($contact, $contacts)) {
- $contacts[] = array('name' => $contact, 'type' => $sql_arr['_type']);
+ $contacts[] = $contact;
$sort_keys[] = sprintf('%s %03d', $sql_arr['name'] , $idx++);
if (count($contacts) >= $MAXNUM) {
@@ -118,7 +118,7 @@ if (!empty($book_types) && strlen($search)) {
if ($group_prop['email']) {
$idx = 0;
foreach ((array)$group_prop['email'] as $email) {
- $contacts[] = array('name' => format_email_recipient($email, $group['name']), 'type' => 'group');
+ $contacts[] = format_email_recipient($email, $group['name']);
$sort_keys[] = sprintf('%s %03d', $group['name'] , $idx++);
if (count($contacts) >= $MAXNUM) {
@@ -131,7 +131,6 @@ if (!empty($book_types) && strlen($search)) {
$sort_keys[] = $group['name'];
$contacts[] = array(
'name' => $group['name'] . ' (' . intval($result->count) . ')',
- 'type' => 'group',
'id' => $group['ID'],
'source' => $id
);