projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #10962 from eileenmcnaughton/fitems
[civicrm-core.git]
/
CRM
/
Activity
/
ActionMapping.php
diff --git
a/CRM/Activity/ActionMapping.php
b/CRM/Activity/ActionMapping.php
index 26e994b8228089d565c042aa25cd50afc574c795..b80bc8996c6546b6a72c20aee1a24bbde123d00f 100644
(file)
--- a/
CRM/Activity/ActionMapping.php
+++ b/
CRM/Activity/ActionMapping.php
@@
-108,7
+108,7
@@
class CRM_Activity_ActionMapping extends \Civi\ActionSchedule\Mapping {
$query['casDateField'] = 'e.activity_date_time';
if (!is_null($schedule->limit_to)) {
$query['casDateField'] = 'e.activity_date_time';
if (!is_null($schedule->limit_to)) {
- $activityContacts = \CRM_
Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'nam
e');
+ $activityContacts = \CRM_
Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validat
e');
if ($schedule->limit_to == 0 || !isset($activityContacts[$schedule->recipient])) {
$recipientTypeId = \CRM_Utils_Array::key('Activity Targets', $activityContacts);
}
if ($schedule->limit_to == 0 || !isset($activityContacts[$schedule->recipient])) {
$recipientTypeId = \CRM_Utils_Array::key('Activity Targets', $activityContacts);
}