From f498a273c3a112fbe49aa1fe33711469d6693c6e Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Wed, 25 Feb 2015 16:00:49 -0800 Subject: [PATCH] CRM-14678 - includes adding conditional on $contactID not defined and fixes a warning in copyPriceSet due to invalid pass by reference. ---------------------------------------- * CRM-14678: Add "Not you, or want to join/contribute for a different person?" text to contribution pages https://issues.civicrm.org/jira/browse/CRM-14678 --- CRM/Contribute/Form/Contribution/Main.php | 2 +- CRM/Event/Form/Registration/Register.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 218c1eeccf..6ad81b8052 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -410,7 +410,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu $contactID = $this->getContactID(); if ($contactID) { $this->assign('contact_id', $contactID); - $this->assign('display_name', CRM_Contact_BAO_Contact::displayName($contactID)); + $this->assign('display_name', CRM_Contact_BAO_Contact::displayName($contactID)); } if ($this->_onbehalf) { diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index a7d7d6c6ed..9ddc5d8393 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -342,7 +342,7 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { $contactID = $this->getContactID(); if ($contactID) { $this->assign('contact_id', $contactID); - $this->assign('display_name', CRM_Contact_BAO_Contact::displayName($contactID)); + $this->assign('display_name', CRM_Contact_BAO_Contact::displayName($contactID)); } $this->add('hidden', 'scriptFee', NULL); -- 2.25.1