From bdd7870e13cbf77e3939134d0c66f9180ea730c9 Mon Sep 17 00:00:00 2001 From: Ravish Nair Date: Thu, 10 Oct 2013 14:29:53 +0530 Subject: [PATCH] -- CRM-13557 also suppressed other invalid fields ---------------------------------------- * CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed http://issues.civicrm.org/jira/browse/CRM-13557 --- CRM/Dedupe/Merger.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index f59614dabe..538894d3a9 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1495,9 +1495,13 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m */ static function getContactFields() { $contactFields = CRM_Contact_DAO_Contact::fields(); - unset($contactFields['id']); - unset($contactFields['hash']); - + $invalidFields = array('api_key', 'contact_is_deleted', 'created_date', 'hash', 'id', 'modified_date', 'preferred_language', + 'primary_contact_id', 'user_unique_id'); + foreach ($contactFields as $field => $value) { + if (in_array($field, $invalidFields)) { + unset($contactFields[$field]); + } + } return array_keys($contactFields); } -- 2.25.1