<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
$ufField->field_type = $params['field_type'];
$ufField->field_name = $params['field_name'];
$ufField->website_type_id = CRM_Utils_Array::value('website_type_id', $params);
- $ufField->location_type_id = CRM_Utils_Array::value('location_type_id', $params);
+ if (is_null(CRM_Utils_Array::value('location_type_id', $params, ''))) {
+ // primary location type have NULL value in DB
+ $ufField->whereAdd("location_type_id IS NULL");
+ }
+ else {
+ $ufField->location_type_id = CRM_Utils_Array::value('location_type_id', $params);
+ }
$ufField->phone_type_id = CRM_Utils_Array::value('phone_type_id', $params);;
if (!empty($params['id'])) {
'address_options', TRUE, NULL, TRUE
);
- if (!$addressOptions['county']) {
+ if (empty($addressOptions['county'])) {
unset($fields['Individual']['county'], $fields['Household']['county'], $fields['Organization']['county']);
}