Merge pull request #15504 from mattwire/transact

[civicrm-core.git] / CRM / Activity / Form / Activity.php

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 446eeb99d93c651a1262ceb54f4e458e3b4d989d..37e37d7357411f4475b9f5cb1e4fb3753d807f8c 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -437,6 +437,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
         || $path == 'civicrm/contact/search/advanced'
         || $path == 'civicrm/contact/search/custom'
         || $path == 'civicrm/group/search'
+        || $path == 'civicrm/contact/search/builder'
       ) {
         $urlString = $path;
       }
@@ -1241,8 +1242,10 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       $activityTypeDisplayLabels = $this->getActivityTypeDisplayLabels();
       if ($activityTypeDisplayLabels[$this->_activityTypeId]) {
         $this->_activityTypeName = $activityTypeDisplayLabels[$this->_activityTypeId];
-        // can't change this instance of activityTName yet - will come back to it dev/core#1116
-        $this->assign('activityTName', $activityTypeDisplayLabels[$this->_activityTypeId]);
+
+        // At the moment this is duplicating other code in this section, but refactoring in small steps.
+        $activityTypeObj = new CRM_Activity_BAO_ActivityType($this->_activityTypeId);
+        $this->assign('activityTypeNameAndLabel', $activityTypeObj->getActivityType());
       }
       // Set title.
       if (isset($activityTypeDisplayLabels)) {