From 550e5b1a088c980f1110e245f5646b2b4767d574 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 20 Sep 2018 18:28:10 +1200 Subject: [PATCH] Partial revert of pull/12559 https://github.com/civicrm/civicrm-core/pull/12559/files is currently in RC. While we find that this change improves performance and we are running it in production we have identified that performance is very poor in the specific scenario where only email is linked to 39000 assignees - in this case it was an old experimental civimail activity. In the interests of prudence I am reverting the parts that switch function in the rc. --- CRM/Activity/BAO/Activity.php | 2 +- CRM/Activity/Selector/Activity.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index f0b149731d..be444ee7dd 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2880,7 +2880,7 @@ INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n } // Get contact activities. - $activities = CRM_Activity_BAO_Activity::getActivities($params); + $activities = CRM_Activity_BAO_Activity::deprecatedGetActivities($params); // Add total. $params['total'] = CRM_Activity_BAO_Activity::deprecatedGetActivitiesCount($params); diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php index 9c279843ea..8182c6409c 100644 --- a/CRM/Activity/Selector/Activity.php +++ b/CRM/Activity/Selector/Activity.php @@ -393,7 +393,7 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C 'sort' => $sort, ); $config = CRM_Core_Config::singleton(); - $rows = CRM_Activity_BAO_Activity::getActivities($params); + $rows = CRM_Activity_BAO_Activity::deprecatedGetActivities($params); if (empty($rows)) { return $rows; -- 2.25.1