projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #16802 from colemanw/coalesce
[civicrm-core.git]
/
CRM
/
Utils
/
DeprecatedUtils.php
diff --git
a/CRM/Utils/DeprecatedUtils.php
b/CRM/Utils/DeprecatedUtils.php
index fc19eaf7fd2c28271638d32ea30dfe9e6907efe0..8e62e1e17b21ae2401e7baf6393f54dd1967001f 100644
(file)
--- 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 = [
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);
'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 = [
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);
'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 = [
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);
'greeting_type' => 'addressee',
];
$addressee = CRM_Core_PseudoConstant::addressee($addresseeFilter);