From: monishdeb <monish.deb@webaccess.co.in>
Date: Fri, 5 Jul 2013 12:59:09 +0000 (+0530)
Subject: CRM-12928 fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6cd12dca624c226d9c8e9ad5f904c5578f67c841;p=civicrm-core.git

CRM-12928 fixes

----------------------------------------
* CRM-12928: Merge contacts fatal error: Unknown column 'source_contact_id' in 'where clause (related to activity restructure)
  http://issues.civicrm.org/jira/browse/CRM-12928
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index a42a25323f..11690964e1 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -193,7 +193,7 @@ class CRM_Dedupe_Merger {
       // foreign keys referencing civicrm_contact(id)
       $cidRefs = array(
         'civicrm_acl_cache' => array('contact_id'),
-        'civicrm_activity' => array('source_contact_id'),
+        'civicrm_activity' => array('source_record_id'),
         'civicrm_activity_contact' => array('contact_id'),
         'civicrm_case_contact' => array('contact_id'),
         'civicrm_contact' => array('primary_contact_id'),