From 07a4c18bfc127eee07588f085de460b5a277d9cd Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Tue, 5 Oct 2021 18:59:55 -0400 Subject: [PATCH] backport 21729 --- CRM/Contribute/BAO/ContributionRecur.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index b468a8fa37..d7a67001f2 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -554,7 +554,11 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id ) unset($overrides['financial_type_id']); } $result = array_merge($templateContribution, $overrides); - $result['line_item'][$order->getPriceSetID()] = $lineItems; + // Line items aren't always written to a contribution, for mystery reasons. + // Checking for their existence prevents $order->getPriceSetID returning NULL. + if ($lineItems) { + $result['line_item'][$order->getPriceSetID()] = $lineItems; + } // If the template contribution was made on-behalf then add the // relevant values to ensure the activity reflects that. $relatedContact = CRM_Contribute_BAO_Contribution::getOnbehalfIds($result['id']); -- 2.25.1