X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FForm%2FCustomData.php;h=8d9d3641cd007229aaf2d1488881f496b622174b;hb=3b16a28270778af5122d850f6a4ee7400b8f9920;hp=f2f49e53605b872d318b5c4ab58c10e012e9713d;hpb=42bf93368ea81b2fa70fab038f3c884755e1ab88;p=civicrm-core.git

diff --git a/CRM/Contact/Form/CustomData.php b/CRM/Contact/Form/CustomData.php
index f2f49e5360..8d9d3641cd 100644
--- a/CRM/Contact/Form/CustomData.php
+++ b/CRM/Contact/Form/CustomData.php
@@ -51,14 +51,14 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   protected $_tableId;
 
   /**
-   * entity type of the table id
+   * Entity type of the table id
    *
    * @var string
    */
   protected $_entityType;
 
   /**
-   * entity sub type of the table id
+   * Entity sub type of the table id
    *
    * @var string
    * @access protected
@@ -66,7 +66,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   protected $_entitySubType;
 
   /**
-   * the group tree data
+   * The group tree data
    *
    * @var array
    */
@@ -94,7 +94,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   protected $_groupCollapseDisplay;
 
   /**
-   * custom group id
+   * Custom group id
    *
    * @int
    * @access public
@@ -105,7 +105,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
 
   public $_copyValueId;
   /**
-   * pre processing work done here.
+   * Pre processing work done here.
    *
    * gets session variables for table name, id of entity in table, type of entity and stores them.
    *
@@ -127,7 +127,11 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
       // NOTE : group id is not stored in session from within CRM_Custom_Form_CustomData::preProcess func
       // this is due to some condition inside it which restricts it from saving in session
       // so doing this for multi record edit action
-      CRM_Custom_Form_CustomData::preProcess($this);
+      $entityId = CRM_Utils_Request::retrieve('entityID', 'Positive', $this);
+      if(!empty($entityId)) {
+        $subType = CRM_Contact_BAO_Contact::getContactSubType($entityId, ',');
+      }
+      CRM_Custom_Form_CustomData::preProcess($this, NULL, $subType, NULL, NULL, $entityId);
       if ($this->_multiRecordDisplay) {
         $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $this);
         $this->_tableID = $this->_entityId;
@@ -171,7 +175,7 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   }
 
   /**
-   * Function to actually build the form
+   * Build the form object
    *
    * @return void
    * @access public