From: Allen Shaw <allen@JoineryHQ.com>
Date: Fri, 26 May 2017 00:51:07 +0000 (-0500)
Subject: Fix CRM-20488: remove restrictions on soft credit contact type.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d89b63b1121cea2c916514307733eccc97f10ada;p=civicrm-core.git

Fix CRM-20488: remove restrictions on soft credit contact type.
---

diff --git a/CRM/Contribute/Form/SoftCredit.php b/CRM/Contribute/Form/SoftCredit.php
index 21b5dcf292..901ea45a3b 100644
--- a/CRM/Contribute/Form/SoftCredit.php
+++ b/CRM/Contribute/Form/SoftCredit.php
@@ -52,12 +52,6 @@ class CRM_Contribute_Form_SoftCredit {
         'entity_id' => $contriDAO->contribution_page_id,
       );
       $profileId = CRM_Core_BAO_UFJoin::getUFGroupIds($ufJoinParams);
-
-      //check if any honree profile is enabled if yes then assign its profile type to $_honoreeProfileType
-      // which will be used to constraint soft-credit contact type in formRule, CRM-13981
-      if (!empty($profileId[0]) && !empty($profileId[2])) {
-        $form->_honoreeProfileType = CRM_Core_BAO_UFGroup::getContactType($profileId[0]);
-      }
     }
   }
 
@@ -242,10 +236,6 @@ class CRM_Contribute_Form_SoftCredit {
           if (empty($fields['soft_credit_amount'][$key])) {
             $errors["soft_credit_amount[$key]"] = ts('Please enter the soft credit amount.');
           }
-          $contactType = CRM_Contact_BAO_Contact::getContactType($fields['soft_credit_contact_id'][$key]);
-          if ($self->_honoreeProfileType && $self->_honoreeProfileType != $contactType) {
-            $errors["soft_credit_contact_id[$key]"] = ts('Please choose a contact of type %1', array(1 => $self->_honoreeProfileType));
-          }
         }
       }
     }