projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-21675: scheduled reminders: limit to group doesn't support smart groups
[civicrm-core.git]
/
Civi
/
ActionSchedule
/
Mapping.php
diff --git
a/Civi/ActionSchedule/Mapping.php
b/Civi/ActionSchedule/Mapping.php
index 6fe50fb41c01a89e8fb29626a85ba733ae34999f..dd25ee7af3803d7cfdaddff1786fd0de8a854d3f 100644
(file)
--- a/
Civi/ActionSchedule/Mapping.php
+++ b/
Civi/ActionSchedule/Mapping.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
6
|
+ | Copyright CiviCRM LLC (c) 2004-201
7
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-286,7
+286,8
@@
abstract class Mapping implements MappingInterface {
protected static function getValueLabelMap($name) {
static $valueLabelMap = NULL;
if ($valueLabelMap === NULL) {
protected static function getValueLabelMap($name) {
static $valueLabelMap = NULL;
if ($valueLabelMap === NULL) {
- $valueLabelMap['activity_type'] = \CRM_Core_PseudoConstant::activityType(TRUE, TRUE);
+ // CRM-20510: Include CiviCampaign activity types along with CiviCase IF component is enabled
+ $valueLabelMap['activity_type'] = \CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE);
asort($valueLabelMap['activity_type']);
$valueLabelMap['activity_status'] = \CRM_Core_PseudoConstant::activityStatus();
asort($valueLabelMap['activity_type']);
$valueLabelMap['activity_status'] = \CRM_Core_PseudoConstant::activityStatus();