From 5322b5e1c9ab47b548814bd0bd65e1dccf99a550 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 25 Apr 2017 20:41:44 +1000 Subject: [PATCH] CRM-20441 Return early if we have removed all Activity IDs as got no access to them --- CRM/Activity/BAO/Activity.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 4d4a75d3b6..885a47be91 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -693,6 +693,9 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { } } } + if (empty($activityIDs)) { + return $getCount ? count($activities) : $activities; + } // fetch all active activity types $activityTypes = CRM_Core_OptionGroup::values('activity_type'); -- 2.25.1