X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FDeprecatedUtils.php;h=8e62e1e17b21ae2401e7baf6393f54dd1967001f;hb=618bebc88fe2a777bfa36fa097b7db1b081699c1;hp=fc19eaf7fd2c28271638d32ea30dfe9e6907efe0;hpb=d1ae16d11c8eaf40d7489f4a2d4605ef2f7c607c;p=civicrm-core.git diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php index fc19eaf7fd..8e62e1e17b 100644 --- a/CRM/Utils/DeprecatedUtils.php +++ b/CRM/Utils/DeprecatedUtils.php @@ -255,7 +255,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) { if (isset($values['email_greeting'])) { if (!empty($params['email_greeting_id'])) { $emailGreetingFilter = [ - 'contact_type' => CRM_Utils_Array::value('contact_type', $params), + 'contact_type' => $params['contact_type'] ?? NULL, 'greeting_type' => 'email_greeting', ]; $emailGreetings = CRM_Core_PseudoConstant::greeting($emailGreetingFilter); @@ -271,7 +271,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) { if (isset($values['postal_greeting'])) { if (!empty($params['postal_greeting_id'])) { $postalGreetingFilter = [ - 'contact_type' => CRM_Utils_Array::value('contact_type', $params), + 'contact_type' => $params['contact_type'] ?? NULL, 'greeting_type' => 'postal_greeting', ]; $postalGreetings = CRM_Core_PseudoConstant::greeting($postalGreetingFilter); @@ -286,7 +286,7 @@ function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) { if (isset($values['addressee'])) { if (!empty($params['addressee_id'])) { $addresseeFilter = [ - 'contact_type' => CRM_Utils_Array::value('contact_type', $params), + 'contact_type' => $params['contact_type'] ?? NULL, 'greeting_type' => 'addressee', ]; $addressee = CRM_Core_PseudoConstant::addressee($addresseeFilter);