From: Ravish Nair <ravish.nair@webaccess.co.in>
Date: Fri, 11 Oct 2013 08:34:22 +0000 (+0530)
Subject: -- CRM-13557 changes as per comment
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=da2015c42fa6f17da23bdce835828199e26eaf58;p=civicrm-core.git

-- CRM-13557 changes as per comment

----------------------------------------
* 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 538894d3a9..a1524189d3 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1495,8 +1495,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
    */
   static function getContactFields() {
     $contactFields = CRM_Contact_DAO_Contact::fields();
-    $invalidFields = array('api_key', 'contact_is_deleted', 'created_date', 'hash', 'id', 'modified_date', 'preferred_language', 
-      'primary_contact_id', 'user_unique_id');
+    $invalidFields = array('api_key', 'contact_is_deleted', 'created_date', 'hash', 'id', 'modified_date', 'primary_contact_id', 'user_unique_id');
     foreach ($contactFields as $field => $value) {
       if (in_array($field, $invalidFields)) {
         unset($contactFields[$field]);