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 a42a25323f49012fe7249d8ff1410c3f7c180550..11690964e11da6e3eb1f478402ff42467bf4e3de 100644 (file)
--- 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'),