From 03cb51fd43a19afffbeb05222dd686614978d66b Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 6 Aug 2021 11:12:43 +1200
Subject: [PATCH] Update contribution_page_id token in sched reminders

---
 CRM/Contribute/BAO/Contribution.php                   | 2 +-
 CRM/Contribute/Tokens.php                             | 2 +-
 CRM/Upgrade/Incremental/php/FiveFortyOne.php          | 3 +++
 tests/phpunit/CRM/Contribute/BAO/ContributionTest.php | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 274dee4ce7..f4f5f4fbea 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -5170,7 +5170,7 @@ LIMIT 1;";
       $pseudoFields = array_keys($processor->getPseudoTokens());
       foreach ($pseudoFields as $pseudoField) {
         $split = explode(':', $pseudoField);
-        $result['values'][$id][$pseudoField] = $processor->getPseudoValue($split[0], $split[1], $result['values'][$id][$split[0]]);
+        $result['values'][$id][$pseudoField] = $processor->getPseudoValue($split[0], $split[1], $result['values'][$id][$split[0]] ?? '');
       }
     }
     return $result;
diff --git a/CRM/Contribute/Tokens.php b/CRM/Contribute/Tokens.php
index 77207fa5f9..e671979590 100644
--- a/CRM/Contribute/Tokens.php
+++ b/CRM/Contribute/Tokens.php
@@ -85,7 +85,7 @@ class CRM_Contribute_Tokens extends AbstractTokenSubscriber {
    */
   public function getBasicTokens(): array {
     $return = [];
-    foreach (['contribution_status_id', 'payment_instrument_id', 'financial_type_id'] as $fieldName) {
+    foreach (['contribution_status_id', 'payment_instrument_id', 'financial_type_id', 'contribution_page_id'] as $fieldName) {
       $return[$fieldName] = $this->getFieldMetadata()[$fieldName]['title'];
     }
     return $return;
diff --git a/CRM/Upgrade/Incremental/php/FiveFortyOne.php b/CRM/Upgrade/Incremental/php/FiveFortyOne.php
index c1140ba635..f672c3031e 100644
--- a/CRM/Upgrade/Incremental/php/FiveFortyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveFortyOne.php
@@ -86,6 +86,9 @@ class CRM_Upgrade_Incremental_php_FiveFortyOne extends CRM_Upgrade_Incremental_B
     $this->addTask('Replace contribution payment instrument token in action schedule',
       'updateActionScheduleToken', 'contribution.payment_instrument', 'contribution.payment_instrument_id:label', $rev
     );
+    $this->addTask('Replace contribution page id token in action schedule',
+      'updateActionScheduleToken', 'contribution.contribution_page_id', 'contribution.contribution_page_id:label', $rev
+    );
   }
 
   /**
diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
index 5094aa918f..1eada58482 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -1341,7 +1341,7 @@ WHERE eft.entity_id = %1 AND ft.to_financial_account_id <> %2";
     $contribution2 = $this->contributionCreate($params);
     $ids = [$contribution1, $contribution2];
 
-    $subject = "This is a test for contribution ID: {contribution.contribution_id}";
+    $subject = 'This is a test for contribution ID: {contribution.contribution_id}';
     $text = 'Contribution Amount: {contribution.total_amount}';
     $html = "<p>Contribution Source: {contribution.contribution_source}</p></br>
       <p>Contribution Invoice ID: {contribution.invoice_id}</p></br>
-- 
2.25.1