-- 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

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index f59614dabe2e82f9283d54873d0f4a4e84740608..538894d3a9544b0566c467edace5324e6ae23359 100644 (file)
--- 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);
   }