CRM-14678 - includes adding conditional on $contactID not defined and fixes a warning...

----------------------------------------
* 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

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 218c1eeccf1c852320b3a899da4e49eb838c46a5..6ad81b805278d2acda600988afe25c53a73c25fe 100644 (file)
--- 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 a7d7d6c6ede06add1eaa8a5c5564dbe4eb19b767..9ddc5d8393557a7ed48db2c87dc06748c6977cee 100644 (file)
--- 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);