From: yashodha <yashodha.chaku@webaccessglobal.com>
Date: Wed, 21 Oct 2015 09:19:33 +0000 (+0530)
Subject: CRM-16990: Custom fields are NOT being saved for some component custom data (activiti... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9ac2fef4b0243b2baac7e7fa88ec635d4570d9d9;p=civicrm-core.git

CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)

----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
  https://issues.civicrm.org/jira/browse/CRM-16990
---

diff --git a/CRM/Contact/Form/Relationship.php b/CRM/Contact/Form/Relationship.php
index 7dc455221c..2cada5b8d8 100644
--- a/CRM/Contact/Form/Relationship.php
+++ b/CRM/Contact/Form/Relationship.php
@@ -202,7 +202,7 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
 
     // when custom data is included in this page
     if (!empty($_POST['hidden_custom'])) {
-      CRM_Custom_Form_CustomData::preProcess($this);
+      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_rtype, 1, 'Relationship', $this->_relationshipId);
       CRM_Custom_Form_CustomData::buildQuickForm($this);
       CRM_Custom_Form_CustomData::setDefaultValues($this);
     }
diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
index 374a2a93d2..fa5f6ab075 100644
--- a/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -71,7 +71,7 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
       $this->set('subType', CRM_Utils_Array::value('event_type_id', $_POST));
       $this->set('entityId', $this->_id);
 
-      CRM_Custom_Form_CustomData::preProcess($this);
+      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_id, 1, 'Event');
       CRM_Custom_Form_CustomData::buildQuickForm($this);
       CRM_Custom_Form_CustomData::setDefaultValues($this);
     }
diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index b419773ea5..2db99745c8 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -160,7 +160,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
 
     // when custom data is included in this page
     if (!empty($_POST['hidden_custom'])) {
-      CRM_Custom_Form_CustomData::preProcess($this);
+      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_memType, 1, 'Membership', $this->_id);
       CRM_Custom_Form_CustomData::buildQuickForm($this);
       CRM_Custom_Form_CustomData::setDefaultValues($this);
     }