From 5810575d057577d452bb48dab1069f560b5eae57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Fri, 6 Nov 2009 14:43:46 +0000 Subject: [PATCH] Be more tolerant within find_contact() --- addressbook/inc/class.addressbook_bo.inc.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index 35e0d09acb..a4f211ac1d 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -1532,14 +1532,12 @@ class addressbook_bo extends addressbook_so 'email', 'email_home'); $tolerance_fields = array('contact_id', 'n_middle', 'n_prefix', 'n_suffix', - 'org_unit', 'role', - 'bday', - 'email', 'email_home', - 'url', 'url_home'); - $addr_one_fields = array('adr_one_street', 'adr_one_street2', + 'bday', 'org_unit', 'title', 'role', + 'email', 'email_home'); + $addr_one_fields = array('adr_one_street', 'adr_one_locality', 'adr_one_region', 'adr_one_postalcode', 'adr_one_countryname'); - $addr_two_fields = array('adr_two_street', 'adr_two_street2', + $addr_two_fields = array('adr_two_street', 'adr_two_locality', 'adr_two_region', 'adr_two_postalcode', 'adr_two_countryname'); $no_addr_one = array();