From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 20 Mar 2015 01:55:05 +0000 (-0700)
Subject: CRM-16134 - Merge case activity created by should be logged in user.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c677b0717a53ab25158dced079d517f75f7f2d6;p=civicrm-core.git

CRM-16134 - Merge case activity created by should be logged in user.

----------------------------------------
* CRM-16134: merge case activities should be attributed to logged in user
  https://issues.civicrm.org/jira/browse/CRM-16134
---

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 0baa5daf8d..8aeb7f3b14 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -2724,13 +2724,13 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')';
         }
       }
 
-      //create merge activity record.
+      //Create merge activity record. Source for merge activity is the logged in user's contact ID ($currentUserId).
       $activityParams = array(
         'subject' => $mergeActSubject,
         'details' => $mergeActSubjectDetails,
         'status_id' => array_search('Completed', $activityStatuses),
         'activity_type_id' => $mergeActType,
-        'source_contact_id' => $mainContactId,
+        'source_contact_id' => $currentUserId,
         'activity_date_time' => date('YmdHis'),
       );