CRM-12697

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index e8d07704627a549ba8c568e118d05d8285024f66..c72877bc1a0b0375b0d720430c92ad97bf7219bb 100644 (file)
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1391,7 +1391,7 @@ SELECT case_status.label AS case_status, status_id, case_type.label AS case_type
     $session = CRM_Core_Session::singleton();
     // CRM-8926 If user is not logged in, use the activity creator as userID
     if (!($userID = $session->get('userID'))) {
-      $userID = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $activityId, 'source_contact_id');
+      $userID = CRM_Activity_BAO_Activity::getSourceContactID($activityId);
     }
 
     //also create activities simultaneously of this copy.
@@ -2369,10 +2369,6 @@ SELECT  id
         $mainActivity->copyValues($mainActVals);
         $mainActivity->id = NULL;
         $mainActivity->activity_date_time = CRM_Utils_Date::isoToMysql($otherActivity->activity_date_time);
-        //do check for merging contact,
-        if ($mainActivity->source_contact_id == $otherContactId) {
-          $mainActivity->source_contact_id = $mainContactId;
-        }
         $mainActivity->source_record_id = CRM_Utils_Array::value($mainActivity->source_record_id,
           $activityMappingIds
         );
@@ -2391,7 +2387,7 @@ SELECT  id
         }
 
         $activityMappingIds[$otherActivityId] = $mainActivityId;
-        // insert log of all activites
+        // insert log of all activities
         CRM_Activity_BAO_Activity::logActivityAction($mainActivity);
 
         $otherActivity->free();
@@ -2405,6 +2401,27 @@ SELECT  id
         $mainCaseActivity->save();
         $mainCaseActivity->free();
 
+        //migrate source activity.
+        $otherSourceActivity = new CRM_Activity_DAO_ActivityContact();
+        $otherSourceActivity->activity_id = $otherActivityId;
+        $otherSourceActivity->record_type_id = $sourceID;
+        $otherSourceActivity->find();
+        while ($otherSourceActivity->fetch()) {
+          $mainActivitySource = new CRM_Activity_DAO_ActivityContact();
+          $mainActivitySource->record_type_id = $sourceID;
+          $mainActivitySource->activity_id = $mainActivityId;
+          $mainActivitySource->contact_id = $otherSourceActivity->contact_id;
+          if ($mainActivitySource->contact_id == $otherContactId) {
+            $mainActivitySource->contact_id = $mainContactId;
+          }
+          //avoid duplicate object.
+          if (!$mainActivitySource->find(TRUE)) {
+            $mainActivitySource->save();
+          }
+          $mainActivitySource->free();
+        }
+        $otherSourceActivity->free();
+
         //migrate target activities.
         $otherTargetActivity = new CRM_Activity_DAO_ActivityContact();
         $otherTargetActivity->activity_id = $otherActivityId;
@@ -2448,9 +2465,10 @@ SELECT  id
         $otherAssigneeActivity->free();
 
         // copy custom fields and attachments
-        $aparams = array('activityID'     => $otherActivityId,
-                         'mainActivityId' => $mainActivityId,
-                        );
+        $aparams = array(
+          'activityID' => $otherActivityId,
+          'mainActivityId' => $mainActivityId,
+        );
         CRM_Activity_BAO_Activity::copyExtendedActivityData($aparams);
       }
 
@@ -2736,6 +2754,10 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')';
               //edit - contact must be source or assignee
               //view - contact must be source/assignee/target
               $isTarget = $isAssignee = $isSource = FALSE;
+              $activityContacts = CRM_Core_PseudoConstant::activityContacts('name');
+              $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
+              $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
+              $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
 
               $target = new CRM_Activity_DAO_ActivityContact();
               $target->record_type_id = $targetID;
@@ -2753,10 +2775,11 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')';
                 $isAssignee = TRUE;
               }
 
-              $activity = new CRM_Activity_DAO_Activity();
-              $activity->id = $activityId;
-              $activity->source_contact_id = $contactId;
-              if ($activity->find(TRUE)) {
+              $source = new CRM_Activity_DAO_ActivityContact();
+              $source->activity_id = $activityId;
+              $source->record_type_id = $sourceID;
+              $source->contact_id = $contactId;
+              if ($source->find(TRUE)) {
                 $isSource = TRUE;
               }