X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FTokens.php;h=6c97c765dfa8b41aea77247f91c608a5c3b02bf2;hb=c5c1703423a83c627c9a4ae17b67ddc57031c949;hp=5906f5e969eb8670daa6e7054688d5cd6f451394;hpb=a6491ceec03e64e45e127222ae268187c652f5b7;p=civicrm-core.git diff --git a/CRM/Contribute/Tokens.php b/CRM/Contribute/Tokens.php index 5906f5e969..6c97c765df 100644 --- a/CRM/Contribute/Tokens.php +++ b/CRM/Contribute/Tokens.php @@ -50,7 +50,7 @@ class CRM_Contribute_Tokens extends \Civi\Token\AbstractTokenSubscriber { 'trxn_id', 'invoice_id', 'currency', - 'cancel_date', + 'contribution_cancel_date', 'receipt_date', 'thankyou_date', 'tax_amount', @@ -69,6 +69,7 @@ class CRM_Contribute_Tokens extends \Civi\Token\AbstractTokenSubscriber { 'source' => 'contribution_source', 'status' => 'contribution_status_id', 'type' => 'financial_type_id', + 'cancel_date' => 'contribution_cancel_date', ]; } @@ -97,8 +98,7 @@ class CRM_Contribute_Tokens extends \Civi\Token\AbstractTokenSubscriber { * @return bool */ public function checkActive(\Civi\Token\TokenProcessor $processor) { - return - !empty($processor->context['actionMapping']) + return !empty($processor->context['actionMapping']) && $processor->context['actionMapping']->getEntity() === 'civicrm_contribution'; }