Merge pull request #18559 from agileware/CIVICRM-1567

[civicrm-core.git] / CRM / Mailing / Form / Task.php

diff --git a/CRM/Mailing/Form/Task.php b/CRM/Mailing/Form/Task.php
index d0ba253d82e8b332af1bceb2bbbd8669773bb808..0b0402be93e7357ef4585d8416fe9666d4c4af65 100644 (file)
--- a/CRM/Mailing/Form/Task.php
+++ b/CRM/Mailing/Form/Task.php
@@ -29,14 +29,14 @@ class CRM_Mailing_Form_Task extends CRM_Core_Form_Task {
   }
 
   /**
-   * @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 = CRM_Utils_Array::value('task', $values);
-    $mailingTasks = CRM_Mailing_Task::tasks();
-    $form->assign('taskName', CRM_Utils_Array::value('task', $values));
+    $form->_task = $values['task'] ?? NULL;
 
     // ids are mailing event queue ids
     $ids = [];