From ca00cad0c6b0c35a5afe3d27727d1195f15f1b2f Mon Sep 17 00:00:00 2001 From: monishdeb Date: Sat, 23 Jan 2016 00:28:09 +0530 Subject: [PATCH] CRM-17822 fix - Export custom fields of type country (regression) https://issues.civicrm.org/jira/browse/CRM-17822 --- CRM/Core/BAO/CustomField.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index e73f82ac10..b11c7ff7f5 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -1125,16 +1125,13 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { */ public static function getDisplayValue($value, $id, &$options, $contactID = NULL, $fieldID = NULL) { $option = &$options[$id]; - $attributes = &$option['attributes']; - $html_type = $attributes['html_type']; - $data_type = $attributes['data_type']; - $format = CRM_Utils_Array::value('format', $attributes); + $field = self::getFieldObject($id); return self::getDisplayValueCommon($value, $option, - $html_type, - $data_type, - $format, + $field->html_type, + $field->data_type, + NULL, $contactID, $fieldID ); -- 2.25.1