From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 28 Sep 2020 10:30:52 +0000 (+0100)
Subject: Merge pull request #18590 from eileenmcnaughton/taskname
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c3a77e853ec775fa7853304ec00f3edc3f0a82fe;p=civicrm-core.git

Merge pull request #18590 from eileenmcnaughton/taskname

[REF] Remove unused taskName variable
---

c3a77e853ec775fa7853304ec00f3edc3f0a82fe
diff --cc CRM/Activity/Form/Task.php
index 470e3692e8,2b550eb813..3be85d5bc3
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@@ -45,11 -45,9 +45,9 @@@ class CRM_Activity_Form_Task extends CR
    public static function preProcessCommon(&$form) {
      $form->_activityHolderIds = [];
  
 -    $values = $form->controller->exportValues($form->get('searchFormName'));
 +    $values = $form->getSearchFormValues();
  
      $form->_task = $values['task'];
-     $activityTasks = CRM_Activity_Task::tasks();
-     $form->assign('taskName', $activityTasks[$form->_task]);
  
      $ids = [];
      if ($values['radio_ts'] == 'ts_sel') {
diff --cc CRM/Contribute/Form/Task.php
index ce5b071fa9,e2f24b6562..e6cc4ea750
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@@ -57,11 -55,9 +57,9 @@@ class CRM_Contribute_Form_Task extends 
    public static function preProcessCommon(&$form) {
      $form->_contributionIds = [];
  
 -    $values = $form->controller->exportValues($form->get('searchFormName'));
 +    $values = $form->getSearchFormValues();
  
      $form->_task = $values['task'] ?? NULL;
-     $contributeTasks = CRM_Contribute_Task::tasks();
-     $form->assign('taskName', CRM_Utils_Array::value($form->_task, $contributeTasks));
  
      $ids = [];
      if (isset($values['radio_ts']) && $values['radio_ts'] == 'ts_sel') {
diff --cc CRM/Core/Form/Task.php
index 65a105d387,579eefc533..2bc0033da6
--- a/CRM/Core/Form/Task.php
+++ b/CRM/Core/Form/Task.php
@@@ -92,12 -92,9 +92,9 @@@ abstract class CRM_Core_Form_Task exten
    public static function preProcessCommon(&$form) {
      $form->_entityIds = [];
  
 -    $searchFormValues = $form->controller->exportValues($form->get('searchFormName'));
 +    $searchFormValues = $form->getSearchFormValues();
  
      $form->_task = $searchFormValues['task'];
-     $className = 'CRM_' . ucfirst($form::$entityShortname) . '_Task';
-     $entityTasks = $className::tasks();
-     $form->assign('taskName', $entityTasks[$form->_task]);
  
      $entityIds = [];
      if ($searchFormValues['radio_ts'] == 'ts_sel') {
diff --cc CRM/Mailing/Form/Task.php
index f7f37eee39,154a04ed3a..0b0402be93
--- a/CRM/Mailing/Form/Task.php
+++ b/CRM/Mailing/Form/Task.php
@@@ -29,16 -29,12 +29,14 @@@ class CRM_Mailing_Form_Task extends CRM
    }
  
    /**
 -   * @param CRM_Core_Form $form
 +   * @param \CRM_Core_Form_Task $form
 +   *
 +   * @throws \CRM_Core_Exception
     */
    public static function preProcessCommon(&$form) {
 -    $values = $form->controller->exportValues($form->get('searchFormName'));
 +    $values = $form->getSearchFormValues();
  
      $form->_task = $values['task'] ?? NULL;
-     $mailingTasks = CRM_Mailing_Task::tasks();
-     $form->assign('taskName', CRM_Utils_Array::value('task', $values));
  
      // ids are mailing event queue ids
      $ids = [];