From e7cf1b904b925ea042de6f3d48148a3f675aa1b3 Mon Sep 17 00:00:00 2001 From: Web Access Date: Wed, 16 Mar 2016 15:23:14 +0530 Subject: [PATCH] CRM-18183 --- CRM/Contact/Form/CustomData.php | 5 +++-- CRM/Contact/Page/View/CustomData.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/Form/CustomData.php b/CRM/Contact/Form/CustomData.php index 04b6819906..b4fb1845ef 100644 --- a/CRM/Contact/Form/CustomData.php +++ b/CRM/Contact/Form/CustomData.php @@ -265,7 +265,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form { $groupTree = &CRM_Core_BAO_CustomGroup::getTree($this->_contactType, $this, $this->_tableID, $this->_groupID, $this->_contactSubType ); - $customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, $this->_groupID); + $customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, $this->_groupID, NULL, NULL, $this->_tableID); } else { $customValueCount = $_POST['hidden_custom_group_count'][$this->_groupID]; @@ -282,7 +282,8 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form { */ public function postProcess() { // Get the form values and groupTree - $params = CRM_Utils_Request::exportValues(); + //CRM-18183 + $params = $this->controller->exportValues($this->_name); CRM_Core_BAO_CustomValueTable::postProcess($params, 'civicrm_contact', diff --git a/CRM/Contact/Page/View/CustomData.php b/CRM/Contact/Page/View/CustomData.php index b56d3b6187..ea7da4c566 100644 --- a/CRM/Contact/Page/View/CustomData.php +++ b/CRM/Contact/Page/View/CustomData.php @@ -151,7 +151,7 @@ class CRM_Contact_Page_View_CustomData extends CRM_Core_Page { $this->assign('multiRecordDisplay', $this->_multiRecordDisplay); $this->assign('skipTitle', 1); } - CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, $recId); + CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, $recId, $this->_contactId); } } else { -- 2.25.1