From 419b3ce94a07b33a82c8ef7f7a502c1d89357ceb Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 20 Mar 2021 10:34:42 +1300
Subject: [PATCH] Simplify setting of softcredit form options

I checked & the empty is just an enotice fix
---
 CRM/Contribute/Form/Task.php                 | 12 +++---------
 CRM/Contribute/Form/Task/PDFLetterCommon.php |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
index 4dd458f7af..f73b7c0934 100644
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@ -59,13 +59,11 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form_Task {
     $ids = $form->getSelectedIDs($values);
     if (!$ids) {
       $result = $form->getSearchQueryResults();
-      $form->_includesSoftCredits = $form->isQueryIncludesSoftCredits();
-      $contributionContactIds = $contactIds = [];
       while ($result->fetch()) {
         $ids[] = $result->contribution_id;
         if ($form->isQueryIncludesSoftCredits()) {
-          $contactIds[$result->contact_id] = $result->contact_id;
-          $contributionContactIds["{$result->contact_id}-{$result->contribution_id}"] = $result->contribution_id;
+          $form->_contactIds[$result->contact_id] = $result->contact_id;
+          $form->_contributionContactIds["{$result->contact_id}-{$result->contribution_id}"] = $result->contribution_id;
         }
       }
       $form->assign('totalSelectedContributions', $form->get('rowCount'));
@@ -76,10 +74,6 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form_Task {
 
       $form->assign('totalSelectedContributions', count($ids));
     }
-    if (!empty($form->isQueryIncludesSoftCredits()) && !empty($contactIds)) {
-      $form->_contactIds = $contactIds;
-      $form->_contributionContactIds = $contributionContactIds;
-    }
 
     $form->_contributionIds = $form->_componentIds = $ids;
     $form->set('contributionIds', $form->_contributionIds);
@@ -99,7 +93,7 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form_Task {
    * Given the contribution id, compute the contact id
    * since its used for things like send email
    */
-  public function setContactIDs() {
+  public function setContactIDs(): void {
     if (!$this->isQueryIncludesSoftCredits()) {
       $this->_contactIds = CRM_Core_DAO::getContactIDsFromComponent(
         $this->_contributionIds,
diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index 957af2baf7..af0b20f90c 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -23,7 +23,7 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
   /**
    * Process the form after the input has been submitted and validated.
    *
-   * @param CRM_Contribute_Form_Task $form
+   * @param \CRM_Contribute_Form_Task_PDFLetter $form
    * @param array $formValues
    */
   public static function postProcess(&$form, $formValues = NULL) {
-- 
2.25.1