[REF] Remove unused taskName variable

This variable is only used at the tpl layer in export - there is a separate PR
to change that usage to something more meaningful
https://github.com/civicrm/civicrm-core/pull/18589

Other than that all this task assignment appears to be just cruft

It's likely that it precedes other ways of setting the page title

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index 462499c38fd338b1bb705f2f9e200413cd1c96e7..2b550eb813ae4e1c9c4528185d22e744325119b9 100644 (file)
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@ -48,8 +48,6 @@ class CRM_Activity_Form_Task extends CRM_Core_Form_Task {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $form->_task = $values['task'];
-    $activityTasks = CRM_Activity_Task::tasks();
-    $form->assign('taskName', $activityTasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {

diff --git a/CRM/Campaign/Form/Task.php b/CRM/Campaign/Form/Task.php
index f59cc30ea60f425f8d24d23c67c0873d597778a0..61411931d0ad3017097b620e3bd4e50440334711 100644 (file)
--- a/CRM/Campaign/Form/Task.php
+++ b/CRM/Campaign/Form/Task.php
@@ -34,9 +34,6 @@ class CRM_Campaign_Form_Task extends CRM_Core_Form_Task {
     $values = $this->controller->exportValues('Search');
 
     $this->_task = $values['task'];
-    $campaignTasks = CRM_Campaign_Task::tasks();
-    $taskName = $campaignTasks[$this->_task] ?? NULL;
-    $this->assign('taskName', $taskName);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {

diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index a7bd173701ef4be7d70aa5e8eb0ace11fdb3c27d..198d64ba5204cde9495f350fe5fe059d07861dc3 100644 (file)
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -129,8 +129,6 @@ class CRM_Contact_Form_Task extends CRM_Core_Form_Task {
     $cacheKey = "civicrm search {$qfKey}";
 
     $form->_task = self::$_searchFormValues['task'] ?? NULL;
-    $crmContactTaskTasks = CRM_Contact_Task::taskTitles();
-    $form->assign('taskName', CRM_Utils_Array::value($form->_task, $crmContactTaskTasks));
 
     // all contacts or action = save a search
     if ((CRM_Utils_Array::value('radio_ts', self::$_searchFormValues) == 'ts_all') ||

diff --git a/CRM/Contact/Form/Task/SaveSearch.php b/CRM/Contact/Form/Task/SaveSearch.php
index a98a29fee0adacc8c6bae1dcaa91ace5448e2328..f843f69ecb1b3c319eab8131ab63fb59ec4e39b3 100644 (file)
--- a/CRM/Contact/Form/Task/SaveSearch.php
+++ b/CRM/Contact/Form/Task/SaveSearch.php
@@ -53,9 +53,7 @@ class CRM_Contact_Form_Task_SaveSearch extends CRM_Contact_Form_Task {
     // Get Task name
     $modeValue = CRM_Contact_Form_Search::getModeValue(CRM_Utils_Array::value('component_mode', $values, CRM_Contact_BAO_Query::MODE_CONTACTS));
     $className = $modeValue['taskClassName'];
-    $taskList = $className::taskTitles();
     $this->_task = $values['task'] ?? NULL;
-    $this->assign('taskName', CRM_Utils_Array::value($this->_task, $taskList));
   }
 
   /**

diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
index 16d61166670f2fad61b8a996f481ced123d99d96..e2f24b6562e5fa196e8e5cdad2a9d91f07aee465 100644 (file)
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@ -58,8 +58,6 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form_Task {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $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 --git a/CRM/Core/Form/Task.php b/CRM/Core/Form/Task.php
index a3bde1d8b668501bd481fe23dfbe7feee44dc6ac..579eefc533e70631a754f549f8a879e5b6a05c8f 100644 (file)
--- a/CRM/Core/Form/Task.php
+++ b/CRM/Core/Form/Task.php
@@ -95,9 +95,6 @@ abstract class CRM_Core_Form_Task extends CRM_Core_Form {
     $searchFormValues = $form->controller->exportValues($form->get('searchFormName'));
 
     $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 --git a/CRM/Event/Form/Task.php b/CRM/Event/Form/Task.php
index 18962108a61cfc379596c8c0077e2ff1fb4f962d..08d4f7cc9f0c0477e9c9d1c1d245e0b84b01dd1d 100644 (file)
--- a/CRM/Event/Form/Task.php
+++ b/CRM/Event/Form/Task.php
@@ -52,7 +52,6 @@ class CRM_Event_Form_Task extends CRM_Core_Form_Task {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {

diff --git a/CRM/Grant/Form/Task.php b/CRM/Grant/Form/Task.php
index b983cec3d72afac8c84b7804bc115370af162b88..571c25433db1a017236e9c8e89eb46902b6d153d 100644 (file)
--- a/CRM/Grant/Form/Task.php
+++ b/CRM/Grant/Form/Task.php
@@ -46,7 +46,6 @@ class CRM_Grant_Form_Task extends CRM_Core_Form_Task {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {

diff --git a/CRM/Mailing/Form/Task.php b/CRM/Mailing/Form/Task.php
index 4a84746aaaba6479e80500081dbbff1f98eb6a76..154a04ed3a34e48dfa558ae6aaea89768f0ef863 100644 (file)
--- a/CRM/Mailing/Form/Task.php
+++ b/CRM/Mailing/Form/Task.php
@@ -35,8 +35,6 @@ class CRM_Mailing_Form_Task extends CRM_Core_Form_Task {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $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 = [];

diff --git a/CRM/Member/Form/Task.php b/CRM/Member/Form/Task.php
index 5f5791d01ab0f3019f7f4f976364c6f5c5485101..da684e433d4b061aee2645d030981143b603b613 100644 (file)
--- a/CRM/Member/Form/Task.php
+++ b/CRM/Member/Form/Task.php
@@ -55,7 +55,6 @@ class CRM_Member_Form_Task extends CRM_Core_Form_Task {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] === 'ts_sel') {

diff --git a/CRM/Pledge/Form/Task.php b/CRM/Pledge/Form/Task.php
index 2dc623f2fc777b61ffeb4f8aef457990192807e1..12df902a9169ea1fbb03de84d507f3577b20a359 100644 (file)
--- a/CRM/Pledge/Form/Task.php
+++ b/CRM/Pledge/Form/Task.php
@@ -46,8 +46,6 @@ class CRM_Pledge_Form_Task extends CRM_Core_Form_Task {
     $values = $form->controller->exportValues('Search');
 
     $form->_task = $values['task'];
-    $pledgeTasks = CRM_Pledge_Task::tasks();
-    $form->assign('taskName', $pledgeTasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {