From cb5d08cd6e4d28819f65c6b72207a7825b7593d6 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Mon, 8 May 2017 17:24:04 +0530
Subject: [PATCH] minor fix

---
 CRM/Activity/BAO/Activity.php                   | 6 ++++--
 tests/phpunit/CRM/Activity/BAO/ActivityTest.php | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 216f7a1390..1811b2e206 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -1403,6 +1403,8 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
    *   Contact ids.
    * @param string $additionalDetails
    *   The additional information of CC and BCC appended to the activity Details.
+   * @param array $contributionIds
+   * @param int $campaignId
    *
    * @return array
    *   ( sent, activityId) if any email is sent and activityId
@@ -1421,7 +1423,7 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
     $contactIds = NULL,
     $additionalDetails = NULL,
     $contributionIds = NULL,
-    $campaign_id = NULL
+    $campaignId = NULL
   ) {
     // get the contact details of logged in contact, which we set as from email
     if ($userID == NULL) {
@@ -1470,7 +1472,7 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
       'details' => $details,
       // FIXME: check for name Completed and get ID from that lookup
       'status_id' => 2,
-      'campaign_id' => $campaign_id,
+      'campaign_id' => $campaignId,
     );
 
     // CRM-5916: strip [case #…] before saving the activity (if present in subject)
diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 1dc83aebc4..1477ec2669 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -5,10 +5,8 @@
  * @group headless
  */
 class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
-
   public function setUp() {
     parent::setUp();
-
     $this->prepareForACLs();
     CRM_Core_Config::singleton()->userPermissionClass->permissions = array('view all contacts', 'access CiviCRM');
   }
@@ -18,7 +16,6 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    */
   public function tearDown() {
     $tablesToTruncate = array(
-      'civicrm_contact',
       'civicrm_activity',
       'civicrm_activity_contact',
       'civicrm_uf_match',
@@ -915,6 +912,7 @@ $text
       $bcc = NULL,
       $contactIds = NULL,
       $additionalDetails = NULL,
+      NULL,
       $campaign_id
     );
     $activity = $this->civicrm_api('activity', 'getsingle', array('id' => $activity_id, 'version' => $this->_apiversion));
-- 
2.25.1