From ee21211c54211847501f46fcbec4ad4aaa880c1d Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 7 Jun 2017 22:51:43 -0400 Subject: [PATCH] CRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys --- CRM/Core/BAO/CustomGroup.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 12016aa21f..8bb14a8fd9 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -425,7 +425,8 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { $toReturn = $tableData; } else { - $toReturn = array_filter($toReturn) + $tableData; + // Supply defaults and remove unknown array keys + $toReturn = array_intersect_key(array_filter($toReturn) + $tableData, $tableData); // Merge in required fields that we must have $toReturn['custom_field'] = array_unique(array_merge($toReturn['custom_field'], array('id', 'column_name', 'data_type'))); $toReturn['custom_group'] = array_unique(array_merge($toReturn['custom_group'], array('id', 'is_multiple', 'table_name', 'name'))); -- 2.25.1