CRM-15555 fix membership forms by inheriting & re-using abstract payment methods

[civicrm-core.git] / CRM / Contribute / Form / Contribution.php

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index e7d3dc8cdef3ec2e49b8aed769bd8211cae46336..dcc4f962026ec95547e42c858070944c33fc0033 100644 (file)
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -294,23 +294,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     $this->assign('showCheckNumber', TRUE);
 
     $this->_fromEmails = CRM_Core_BAO_Email::getFromEmail();
-    try {
-      if ($this->_mode) {
-        $this->assignProcessors();
-        if ($this->_contactID) {
-          list($this->userDisplayName, $this->userEmail) = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactID);
-          $this->assign('displayName', $this->userDisplayName);
-        }
-
-        $this->assignBillingType();
-
-        $this->_fields = array();
-        CRM_Core_Payment_Form::setPaymentFieldsByProcessor($this, $this->_paymentProcessor);
-      }
-    }
-    catch (CRM_Core_Exception $e) {
-      CRM_Core_Error::fatal($e->getMessage());
-    }
+    $this->assignPaymentRelatedVariables();
 
     if (in_array('CiviPledge', CRM_Core_Config::singleton()->enableComponents) && !$this->_formType) {
       $this->preProcessPledge();