Remove never-used undeclared property

diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php
index b9ff55e169882bb33325a82a6e2f0eba8b15676b..8259ce179dd9ae1ec9b923fe49783dfddf80c265 100644 (file)
--- a/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/CRM/Contribute/Form/AbstractEditPayment.php
@@ -212,17 +212,6 @@ class CRM_Contribute_Form_AbstractEditPayment extends CRM_Contact_Form_Task {
    */
   protected $_component;
 
-  /**
-   * Array of fields to display on billingBlock.tpl - this is not fully implemented but basically intent is the panes/fieldsets on this page should
-   * be all in this array in order like
-   *  'credit_card' => array('credit_card_number' ...
-   *  'billing_details' => array('first_name' ...
-   *
-   * such that both the fields and the order can be more easily altered by payment processors & other extensions
-   * @var array
-   */
-  public $billingFieldSets = [];
-
   /**
    * Monetary fields that may be submitted.
    *

diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index 5f0b99a110861aa00975df6178c5d57795c62598..6002459f34172e74807ee92779f43465aaa50d3f 100644 (file)
--- a/CRM/Core/Payment/Form.php
+++ b/CRM/Core/Payment/Form.php
@@ -39,7 +39,6 @@ class CRM_Core_Payment_Form {
    *   ID of the payment processor.
    */
   public static function setPaymentFieldsByProcessor(&$form, $processor, $billing_profile_id = NULL, $isBackOffice = FALSE, $paymentInstrumentID = NULL) {
-    $form->billingFieldSets = [];
     // Load the pay-later processor
     // @todo load this right up where the other processors are loaded initially.
     if (empty($processor)) {
@@ -55,12 +54,10 @@ class CRM_Core_Payment_Form {
     $form->assign('paymentTypeName', $paymentTypeName);
     $form->assign('paymentTypeLabel', self::getPaymentLabel($processor['object']));
     $form->assign('isBackOffice', $isBackOffice);
-    $form->_paymentFields = $form->billingFieldSets[$paymentTypeName]['fields'] = self::getPaymentFieldMetadata($processor);
+    $form->_paymentFields = self::getPaymentFieldMetadata($processor);
     $form->_paymentFields = array_merge($form->_paymentFields, self::getBillingAddressMetadata($processor, $form->_bltID));
     $form->assign('paymentFields', self::getPaymentFields($processor));
     self::setBillingAddressFields($form, $processor);
-    // @todo - this may be obsolete - although potentially it could be used to re-order things in the form.
-    $form->billingFieldSets['billing_name_address-group']['fields'] = [];
   }
 
   /**