Fix bug where contacts search could skip some records (#6130)

roundcube · Jan 10, 2018 · ce33816 · ce33816
1 parent 64ad874
commit ce33816
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -62,6 +62,7 @@ CHANGELOG Roundcube Webmail
 - Fix touch event issue on messages list in IE/Edge (#5781)
 - Fix so links over images are not removed in plain text signatures converted from HTML (#4473)
 - Fix various issues when downloading files with names containing non-ascii chars, use RFC 2231 (#5772)
+- Fix bug where contacts search could skip some records (#6130)
 
 RELEASE 1.3.4
 -------------

diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
@@ -654,13 +654,16 @@ public static function compose_search_name($contact, $email = null, $name = null
      */
     public static function compose_contact_key($contact, $sort_col)
     {
-        $key = $contact[$sort_col] . ':' . $contact['sourceid'];
+        $key = $contact[$sort_col];
 
         // add email to a key to not skip contacts with the same name (#1488375)
         if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
             $key .= ':' . implode(':', (array)$email);
         }
 
+        // Make the key really unique (as we e.g. support contacts with no email)
+        $key .= ':' . $contact['sourceid'] . ':' . $contact['ID'];
+
         return $key;
     }