From dc33398e82edd9d76b9fc19dac23fe21f784bf49 Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Fri, 22 Apr 2016 12:05:43 +0100 Subject: [PATCH] CRM-18338: Merge activity test fixes --- CRM/Dedupe/Merger.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 0226c2d9fa..a983913124 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1919,6 +1919,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m 2 => $mainId, ); $activity = civicrm_api3('activity', 'create', array( + 'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ? CRM_Core_Session::getLoggedInContactID() : + $mainId, 'subject' => ts('Contact ID %1 has been merged and deleted.', $params), 'target_contact_id' => $mainId, 'activity_type_id' => 'Contact Merged', @@ -1926,6 +1928,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m )); if (civicrm_api3('Setting', 'getvalue', array('name' => 'contact_undelete', 'group' => 'CiviCRM Preferences'))) { civicrm_api3('activity', 'create', array( + 'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ? CRM_Core_Session::getLoggedInContactID() : + $otherId, 'subject' => ts('Contact ID %1 has been merged into Contact ID %2 and deleted.', $params), 'target_contact_id' => $otherId, 'activity_type_id' => 'Contact Deleted by Merge', -- 2.25.1