X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FForm%2FContribution.php;h=f7ff56ec636fcd68dd9f45f30bb42ed8387302ff;hb=91768280ebeb7937434ff94104d2de8adf74cbc5;hp=e30f8706e9747f7966b90b557360e990cf5c21e4;hpb=96d9784edbe083b434bdd8f3f192b39ad67389d9;p=civicrm-core.git diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index e30f8706e9..f7ff56ec63 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -637,7 +637,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $paymentInstrument = FALSE; if (!$this->_mode) { // payment_instrument isn't required in edit and will not be present when payment block is enabled. - $required = $this->_id ? FALSE : TRUE; + $required = !$this->_id; $checkPaymentID = array_search('Check', CRM_Contribute_PseudoConstant::paymentInstrument('name')); $paymentInstrument = $this->add('select', 'payment_instrument_id', ts('Payment Method'), @@ -776,7 +776,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $totalAmount = $this->addMoney('total_amount', ts('Total Amount'), - ($hasPriceSets) ? FALSE : TRUE, + !$hasPriceSets, $attributes['total_amount'], TRUE, 'currency', NULL, $currencyFreeze );