Skip to content
Snippets Groups Projects
Commit 3e93ae67 authored by eileen's avatar eileen
Browse files

CRM-13234 define type for 'Country' custom fields (integer) as e-Notice was picked up by tests

parent 4bcfd71f
No related branches found
No related tags found
No related merge requests found
...@@ -1360,6 +1360,7 @@ function _getStandardTypeFromCustomDataType($dataType) { ...@@ -1360,6 +1360,7 @@ function _getStandardTypeFromCustomDataType($dataType) {
'File' => CRM_Utils_Type::T_STRING, 'File' => CRM_Utils_Type::T_STRING,
'Link' => CRM_Utils_Type::T_STRING, 'Link' => CRM_Utils_Type::T_STRING,
'ContactReference' => CRM_Utils_Type::T_INT, 'ContactReference' => CRM_Utils_Type::T_INT,
'Country' => CRM_Utils_Type::T_INT,
); );
return $mapping[$dataType]; return $mapping[$dataType];
} }
...@@ -1369,10 +1370,9 @@ function _getStandardTypeFromCustomDataType($dataType) { ...@@ -1369,10 +1370,9 @@ function _getStandardTypeFromCustomDataType($dataType) {
function _civicrm_api3_getdefaults($apiRequest) { function _civicrm_api3_getdefaults($apiRequest) {
$defaults = array(); $defaults = array();
$result = civicrm_api($apiRequest['entity'], $result = civicrm_api3($apiRequest['entity'],
'getfields', 'getfields',
array( array(
'version' => 3,
'action' => $apiRequest['action'], 'action' => $apiRequest['action'],
) )
); );
...@@ -1420,10 +1420,9 @@ function _civicrm_api3_swap_out_aliases(&$apiRequest) { ...@@ -1420,10 +1420,9 @@ function _civicrm_api3_swap_out_aliases(&$apiRequest) {
} }
return; return;
} }
$result = civicrm_api($apiRequest['entity'], $result = civicrm_api3($apiRequest['entity'],
'getfields', 'getfields',
array( array(
'version' => 3,
'action' => $apiRequest['action'], 'action' => $apiRequest['action'],
) )
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment