Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused private function removeNullContactTokens #24932

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Remove unused private function removeNullContactTokens #24932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions CRM/Utils/Token.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,58 +1366,6 @@ public static function replaceGreetingTokens(&$tokenString, $contactDetails = NU
}
}

/**
* At this point, $contactDetails has loaded the contact from the DAO. Any
* (non-custom) missing fields are null. By removing them, we can avoid
* expensive calls to CRM_Contact_BAO_Query.
*
* @deprecated unused in core
*
* @param string $tokenString
* @param array $contactDetails
* @param array $greetingTokens
*/
private static function removeNullContactTokens(&$tokenString, $contactDetails, &$greetingTokens) {

// Only applies to contact tokens
if (!array_key_exists('contact', $greetingTokens)) {
return;
}

$greetingTokensOriginal = $greetingTokens;
$contactFieldList = CRM_Contact_DAO_Contact::fields();
// Sometimes contactDetails are in a multidemensional array, sometimes a
// single-dimension array.
if (array_key_exists(0, $contactDetails) && is_array($contactDetails[0])) {
$contactDetails = current($contactDetails[0]);
}
$nullFields = array_keys(array_diff_key($contactFieldList, $contactDetails));

// Handle legacy tokens
foreach (self::legacyContactTokens() as $oldToken => $newToken) {
if (CRM_Utils_Array::key($newToken, $nullFields)) {
$nullFields[] = $oldToken;
}
}

// Remove null contact fields from $greetingTokens
$greetingTokens['contact'] = array_diff($greetingTokens['contact'], $nullFields);

// Also remove them from $tokenString
$removedTokens = array_diff($greetingTokensOriginal['contact'], $greetingTokens['contact']);
// Handle legacy tokens again, sigh
if (!empty($removedTokens)) {
foreach ($removedTokens as $token) {
if (CRM_Utils_Array::value($token, self::legacyContactTokens()) !== NULL) {
$removedTokens[] = CRM_Utils_Array::value($token, self::legacyContactTokens());
}
}
foreach ($removedTokens as $token) {
$tokenString = str_replace("{contact.$token}", '', $tokenString);
}
}
}

/**
* @param $tokens
*
Expand Down