From fc219888f5802b787a1f766543b2790c0318b6a0 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 1 Dec 2021 11:21:04 +1300
Subject: [PATCH] Remove isset from a.net

---
 CRM/Core/Payment/AuthorizeNet.php                             | 3 ++-
 .../CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php
index e28bdbf900..ef44058b12 100644
--- a/CRM/Core/Payment/AuthorizeNet.php
+++ b/CRM/Core/Payment/AuthorizeNet.php
@@ -304,7 +304,8 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment {
     $template->assign('billingState', $this->_getParam('state_province'));
     $template->assign('billingZip', $this->_getParam('postal_code', TRUE));
     $template->assign('billingCountry', $this->_getParam('country'));
-
+    // Required to be set for s
+    $template->ensureVariablesAreAssigned(['subscriptionType']);
     $arbXML = $template->fetch('CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl');
 
     // Submit to authorize.net
diff --git a/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl b/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
index 78b154da7e..970eb4d6cd 100644
--- a/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl
@@ -7,7 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if isset($subscriptionType) && $subscriptionType eq 'cancel'}
+{if $subscriptionType eq 'cancel'}
 <?xml version="1.0" encoding="utf-8"?>
 <ARBCancelSubscriptionRequest xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd">
   <merchantAuthentication>
@@ -16,7 +16,7 @@
   </merchantAuthentication>
   <subscriptionId>{$subscriptionId}</subscriptionId>
 </ARBCancelSubscriptionRequest>
-{elseif isset($subscriptionType) && $subscriptionType eq 'updateBilling'}
+{elseif $subscriptionType eq 'updateBilling'}
 <?xml version="1.0" encoding="utf-8"?>
 <ARBUpdateSubscriptionRequest xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd">
   <merchantAuthentication>
-- 
2.25.1