From dbe49889416dc613fa00de3c03e157de2e9b346c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 04 Jun 2010 07:51:50 -0400
Subject: [PATCH] - Remove duplicates in autocomplete result (#1486772)
---
program/steps/mail/autocomplete.inc | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 2fb5eb6..4fbea1f 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -37,6 +37,7 @@
}
else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
$contacts = array();
+ $books_num = count($book_types);
foreach ($book_types as $id) {
$abook = $RCMAIL->get_address_book($id);
@@ -44,9 +45,13 @@
if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) {
while ($sql_arr = $result->iterate()) {
- $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+ $contact = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+ // when we've got more than one book, we need to skip duplicates
+ if ($books_num == 1 || !in_array($contact, $contacts)) {
+ $contacts[] = $contact;
if (count($contacts) >= $MAXNUM)
break 2;
+ }
}
}
--
Gitblit v1.9.1