projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix conflict on visibility of ->_paymentProcessors
[civicrm-core.git]
/
CRM
/
Contribute
/
Form
/
Contribution
/
ThankYou.php
diff --git
a/CRM/Contribute/Form/Contribution/ThankYou.php
b/CRM/Contribute/Form/Contribution/ThankYou.php
index 07973821ab7e3d9adf34070923a4b800b2aa3d1e..f9dc5d3fb479f2936c2e8f350281fe0ac78e168d 100644
(file)
--- a/
CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/
CRM/Contribute/Form/Contribution/ThankYou.php
@@
-45,8
+45,6
@@
class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
/**
* Set variables up before form is built.
/**
* Set variables up before form is built.
- *
- * @return void
*/
public function preProcess() {
parent::preProcess();
*/
public function preProcess() {
parent::preProcess();
@@
-174,8
+172,7
@@
class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
$this->assign('membership_amount', $membershipAmount);
$this->assign('renewal_mode', $renewalMode);
$this->assign('membership_amount', $membershipAmount);
$this->assign('renewal_mode', $renewalMode);
- CRM_Member_BAO_Membership::buildMembershipBlock($this,
- $this->_id,
+ $this->buildMembershipBlock(
$this->_membershipContactID,
FALSE,
$membershipTypeID,
$this->_membershipContactID,
FALSE,
$membershipTypeID,