From 5bf5476f5d3559a2750cc75027b5f3565dd0dbe1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 7 Jul 2022 11:04:12 +1200 Subject: [PATCH] Enotice fix for when campaign is disabled --- CRM/Contribute/BAO/ContributionRecur.php | 2 +- tests/phpunit/CRM/Contribute/BAO/ContributionRecurTest.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index a8827cfd5f..30f590d695 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -509,7 +509,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id ) $overrides = array_filter([ 'is_test' => $inputOverrides['is_test'] ?? $recurringContribution['is_test'], 'financial_type_id' => $inputOverrides['financial_type_id'] ?? $recurringContribution['financial_type_id'], - 'campaign_id' => $inputOverrides['campaign_id'] ?? $recurringContribution['campaign_id'], + 'campaign_id' => $inputOverrides['campaign_id'] ?? ($recurringContribution['campaign_id'] ?? NULL), 'total_amount' => $inputOverrides['total_amount'] ?? $recurringContribution['amount'], ], 'strlen'); diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionRecurTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionRecurTest.php index fe83485bcf..3e88ff88fd 100644 --- a/tests/phpunit/CRM/Contribute/BAO/ContributionRecurTest.php +++ b/tests/phpunit/CRM/Contribute/BAO/ContributionRecurTest.php @@ -98,8 +98,6 @@ class CRM_Contribute_BAO_ContributionRecurTest extends CiviUnitTestCase { /** * Test checking if contribution recur object can allow for changes to financial types. - * - * @throws \CRM_Core_Exception|\CiviCRM_API3_Exception */ public function testSupportFinancialTypeChange(): void { $contributionRecur = $this->callAPISuccess('contribution_recur', 'create', $this->_params); -- 2.25.1