Updated call to civicrm_views_custom_data_cache as per CRM-18776 (#386)

* Updated call to civicrm_views_custom_data_cache as per CRM-18776 * More readable version, thanks GinkoFJG
civicrm · Oct 12, 2016 · e9eca96 · e9eca96 · JohnFF · Feb 1, 2017
1 parent 71ef497
commit e9eca96
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/modules/views/components/civicrm.core.inc b/modules/views/components/civicrm.core.inc
@@ -2910,9 +2910,11 @@ function _civicrm_core_data(&$data, $enabled) {
 
 
   while ($dao->fetch()) {
-    // call getTree using $dao->id as groupID and $dao->extends as entityType
-
-    $data = civicrm_views_custom_data_cache($data, $dao->extends, $dao->id, $dao->extends_entity_column_value);
+    // call getTree using $dao->id as groupID, $dao->extends as entityType, with possible subtypes in $dao->extends_entity_column_value
+    $extendsContactSubtype = (('Contact' === $dao->extends) && !empty($dao->extends_entity_column_value));
+    $contactSubtypes = !$extendsContactSubtype ? NULL : array_filter(explode(CRM_Core_DAO::VALUE_SEPARATOR, $dao->extends_entity_column_value));
+    $contactSubtypes = empty($contactSubtypes) ? NULL : $contactSubtypes;
+    $data = civicrm_views_custom_data_cache($data, $dao->extends, $dao->id, $contactSubtypes);
   }
 }