Merge pull request #18680 from eileenmcnaughton/x

dev/financial#151 Paypal express validation fix on event
civicrm · Oct 7, 2020 · 5c0576a · 5c0576a
2 parents a963148 + ca748f0
commit 5c0576a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
@@ -1132,8 +1132,13 @@ protected function isPaypalExpress($params) {
     // The contribution form passes a 'button' but the event form might still set one of these fields.
     // @todo more standardisation & get paypal fully out of the form layer.
     $possibleExpressFields = [
+      // @todo - we think these top 2 are likely not required & it's still here
+      // on a precautionary basis.
+      // see https://github.com/civicrm/civicrm-core/pull/18680
       '_qf_Register_upload_express_x',
       '_qf_Payment_upload_express_x',
+      '_qf_Register_upload_express',
+      '_qf_Payment_upload_express',
       '_qf_Main_upload_express',
     ];
     if (array_intersect_key($params, array_fill_keys($possibleExpressFields, 1))) {