From: Coleman Watts Date: Thu, 21 Aug 2014 12:44:59 +0000 (+0100) Subject: CRM-13863 - Double title removal X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2c13688cea8ad5a175a4747a2eb57d26e8399ed1;p=civicrm-core.git CRM-13863 - Double title removal --- diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php index 0a0c20f662..cdb1008974 100644 --- a/CRM/Contribute/Form/AdditionalPayment.php +++ b/CRM/Contribute/Form/AdditionalPayment.php @@ -150,12 +150,9 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract $this->assign('paymentType', $this->_paymentType); $this->assign('paymentAmt', abs($paymentAmt)); - $this->_paymentProcessor = array('billing_mode' => 1); + $this->setPageTitle($this->_refund ? ts('Refund') : ts('Payment')); - $title = ($this->_refund) ? "Refund for {$this->_contributorDisplayName}" : "Payment from {$this->_contributorDisplayName}"; - if ($title) { - CRM_Utils_System::setTitle(ts('%1', array(1 => $title))); - } + $this->_paymentProcessor = array('billing_mode' => 1); } /** diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl index 581125fa89..822c69fdea 100644 --- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl +++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl @@ -60,11 +60,6 @@ {include file="CRM/Contribute/Form/AdditionalInfo/$formType.tpl"} {else} -{if $paymentType eq 'refund'} -

{ts}New Event Refund{/ts}

-{else} -

{if $component eq 'event'}{if $contributionMode}{ts}Credit Card Event Payment{/ts}{else}{ts}New Event Payment{/ts}{/if}{/if}

-{/if}
{if $contributionMode == 'test'}