X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FActionSchedule%2FMapping.php;h=dd25ee7af3803d7cfdaddff1786fd0de8a854d3f;hb=cc94960644392afecf2523025347bfb6a1dfcc50;hp=6fe50fb41c01a89e8fb29626a85ba733ae34999f;hpb=e68d4035151c218b5e504883725fecd62eaea4ac;p=civicrm-core.git

diff --git a/Civi/ActionSchedule/Mapping.php b/Civi/ActionSchedule/Mapping.php
index 6fe50fb41c..dd25ee7af3 100644
--- a/Civi/ActionSchedule/Mapping.php
+++ b/Civi/ActionSchedule/Mapping.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | 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) {
-      $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();