Merge pull request #23037 from eileenmcnaughton/assign2

Ensure soft credit types are assigned to the template
civicrm · Apr 1, 2022 · 3b04d17 · 3b04d17
2 parents b29749a + 8082f0e
commit 3b04d17
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -2840,10 +2840,10 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
             'Amount' => CRM_Utils_Money::format($softCredit['amount'], $softCredit['currency']),
           ];
         }
-        $template->assign('softCreditTypes', $softCreditTypes);
-        $template->assign('softCredits', $softCredits);
       }
     }
+    $template->assign('softCreditTypes', $softCreditTypes ?? NULL);
+    $template->assign('softCredits', $softCredits ?? NULL);
 
     $dao = new CRM_Contribute_DAO_ContributionProduct();
     $dao->contribution_id = $this->id;