From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Sun, 17 May 2015 23:36:13 +0000 (+1200)
Subject: CRM-16450 fix for multiple custom fields
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3f8560b2182b5fc038714c19ecdc1d7022aa7a7e;p=civicrm-core.git

CRM-16450 fix for multiple custom fields
---

diff --git a/CRM/Contact/Page/View/CustomData.php b/CRM/Contact/Page/View/CustomData.php
index ff16d13107..19c8063372 100644
--- a/CRM/Contact/Page/View/CustomData.php
+++ b/CRM/Contact/Page/View/CustomData.php
@@ -112,7 +112,7 @@ class CRM_Contact_Page_View_CustomData extends CRM_Core_Page {
       //Custom Groups Inline
       $entityType = CRM_Contact_BAO_Contact::getContactType($this->_contactId);
       $entitySubType = CRM_Contact_BAO_Contact::getContactSubType($this->_contactId);
-      $groupTree = &CRM_Core_BAO_CustomGroup::getTree($entityType, $this, $this->_contactId,
+      $groupTree = CRM_Core_BAO_CustomGroup::getTree($entityType, $this, $this->_contactId,
         $this->_groupId, $entitySubType
       );
 
@@ -142,6 +142,8 @@ class CRM_Contact_Page_View_CustomData extends CRM_Core_Page {
         $page->set('multiRecordFieldListing', $multiRecordFieldListing);
         $page->set('pageViewType', 'customDataView');
         $page->set('contactType', $ctype);
+        $page->assign('viewCustomData', array($this->_groupId => array($this->_groupId =>
+          $groupTree[$this->_groupId])));
         $page->run();
       }
       else {