projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8ec293
)
CRM-20441 Return early if we have removed all Activity IDs as got no access to them
author
Seamus Lee
<seamuslee001@gmail.com>
Tue, 25 Apr 2017 10:41:44 +0000
(20:41 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Tue, 25 Apr 2017 10:41:44 +0000
(20:41 +1000)
CRM/Activity/BAO/Activity.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Activity/BAO/Activity.php
b/CRM/Activity/BAO/Activity.php
index 4d4a75d3b6e426511c05d05638f79947edd28b8a..885a47be9197f618f70b2dd8d17bcb7a394ac2b0 100644
(file)
--- 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');