From 225584c91fea180fc9e06c9171f08b7f222ebac1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 24 Jun 2015 23:39:11 +1200 Subject: [PATCH] fix error where 4.6 change was not merged correctly to master. Change affects adding a paramter to the function signature --- CRM/Contribute/Form/Contribution.php | 2 +- CRM/Core/Payment/Form.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 6bcb35fa5b..efe353d68b 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -570,7 +570,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP } if ($this->_mode) { - if (CRM_Core_Payment_Form::buildPaymentForm($this, $this->_paymentProcessor, FALSE) == TRUE) { + if (CRM_Core_Payment_Form::buildPaymentForm($this, $this->_paymentProcessor, FALSE, TRUE) == TRUE) { if (!empty($this->_recurPaymentProcessors)) { CRM_Contribute_Form_Contribution_Main::buildRecur($this); $this->setDefaults(array('is_recur' => 0)); diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php index 9f6162a005..3490b2c064 100644 --- a/CRM/Core/Payment/Form.php +++ b/CRM/Core/Payment/Form.php @@ -253,6 +253,12 @@ class CRM_Core_Payment_Form { * for payment processors that gather payment data on site as rendering the fields as not being required. (not entirely sure why but this * is implemented for back office forms) * + * @param bool $isBackOffice + * Is this a backoffice form. This could affect the display of the cvn or whether some processors show, + * although the distinction is losing it's meaning as front end forms are used for back office and a permission + * for the 'enter without cvn' is probably more appropriate. Paypal std does not support another user + * entering details but once again the issue is not back office but 'another user'. + * * @return bool */ public static function buildPaymentForm(&$form, $processor, $isBillingDataOptional, $isBackOffice) { -- 2.25.1