From 3e93ae67128d705bfd86df5c63fc5594b45e90fe Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 21 Aug 2013 23:43:32 +1200 Subject: [PATCH] CRM-13234 define type for 'Country' custom fields (integer) as e-Notice was picked up by tests --- api/v3/utils.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/api/v3/utils.php b/api/v3/utils.php index a0798270f4..14f6daa352 100644 --- a/api/v3/utils.php +++ b/api/v3/utils.php @@ -1360,6 +1360,7 @@ function _getStandardTypeFromCustomDataType($dataType) { 'File' => CRM_Utils_Type::T_STRING, 'Link' => CRM_Utils_Type::T_STRING, 'ContactReference' => CRM_Utils_Type::T_INT, + 'Country' => CRM_Utils_Type::T_INT, ); return $mapping[$dataType]; } @@ -1369,10 +1370,9 @@ function _getStandardTypeFromCustomDataType($dataType) { function _civicrm_api3_getdefaults($apiRequest) { $defaults = array(); - $result = civicrm_api($apiRequest['entity'], + $result = civicrm_api3($apiRequest['entity'], 'getfields', array( - 'version' => 3, 'action' => $apiRequest['action'], ) ); @@ -1420,10 +1420,9 @@ function _civicrm_api3_swap_out_aliases(&$apiRequest) { } return; } - $result = civicrm_api($apiRequest['entity'], + $result = civicrm_api3($apiRequest['entity'], 'getfields', array( - 'version' => 3, 'action' => $apiRequest['action'], ) ); -- 2.25.1