Activity tab performance - switch from deprecatedGetActivitiesCount t…

…o getActivitiesCount ditto for getActivities. This is a combination of 2 upstream PRs civicrm#12557 and civicrm#12559 Note - when trying to test use contact 72 - pretty sure at the moment the new code is on staging & old on live Bug: T199753 Bug: T191867 Change-Id: I1624b70eca431c018727618ebc7e8c35dc2121d4
eileenmcnaughton · Jan 3, 2019 · 40c19fc · 40c19fc
1 parent 2127fdd
commit 40c19fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
@@ -2902,7 +2902,7 @@ public static function getContactActivitySelector(&$params) {
     $activities = CRM_Activity_BAO_Activity::deprecatedGetActivities($params);
 
     // Add total.
-    $params['total'] = CRM_Activity_BAO_Activity::deprecatedGetActivitiesCount($params);
+    $params['total'] = CRM_Activity_BAO_Activity::getActivitiesCount($params);
 
     // Format params and add links.
     $contactActivities = array();

diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php
@@ -359,7 +359,7 @@ public function getTotalCount($action, $case = NULL) {
       'rowCount' => 0,
       'sort' => NULL,
     );
-    return CRM_Activity_BAO_Activity::deprecatedGetActivitiesCount($params);
+    return CRM_Activity_BAO_Activity::getActivitiesCount($params);
   }
 
   /**

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
@@ -2730,7 +2730,7 @@ public static function getCountComponent($component, $contactId, $tableName = NU
           'caseId' => NULL,
           'context' => 'activity',
         );
-        return CRM_Activity_BAO_Activity::deprecatedGetActivitiesCount($input);
+        return CRM_Activity_BAO_Activity::getActivitiesCount($input);
 
       case 'mailing':
         $params = array('contact_id' => $contactId);