Changeset 3715 in subversion

Timestamp:

Jun 4, 2010 7:51:50 AM (3 years ago)

Author:

alec

Message:

• Remove duplicates in autocomplete result (#1486772)

File:

• trunk/roundcubemail/program/steps/mail/autocomplete.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/autocomplete.inc

@@ -38 +38 @@
 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) {
@@ -45 +46 @@
     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;
+        }
       }
     }