From: Mattias Michaux <mattias.michaux@gmail.com>
Date: Fri, 29 Apr 2016 19:04:31 +0000 (+0200)
Subject: Fixed incorrect parameter.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e8691b2cfbdf93116a70729c0434b87a66f69053;p=civicrm-core.git

Fixed incorrect parameter.
---

diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php
index 21164501e6..b91804d8aa 100644
--- a/CRM/Activity/Page/AJAX.php
+++ b/CRM/Activity/Page/AJAX.php
@@ -401,6 +401,11 @@ class CRM_Activity_Page_AJAX {
     $params = CRM_Core_Page_AJAX::defaultSortAndPagerParams();
     $params += CRM_Core_Page_AJAX::validateParams($requiredParameters, $optionalParameters);
 
+    // To be consistent, the cid parameter should be renamed to contact_id in
+    // the template file, see templates/CRM/Activity/Selector/Selector.tpl
+    $params['contact_id'] = $params['cid'];
+    unset($params['cid']);
+
     // get the contact activities
     $activities = CRM_Activity_BAO_Activity::getContactActivitySelector($params);