Skip to content
Snippets Groups Projects
Commit cb47d053 authored by eileen's avatar eileen
Browse files

[REF] Fix some more calls to getTokens to make it clear only the first return value is used

parent 29ff32ea
Branches
Tags
No related merge requests found
......@@ -567,8 +567,8 @@ function civicrm_api3_mailing_preview($params) {
$details = $details[0][0] ?? NULL;
}
else {
$details = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
$details = $details[0][$contactID];
[$details] = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
$details = $details[$contactID];
}
$mime = $mailing->compose(NULL, NULL, NULL, $contactID, $fromEmail, $fromEmail,
......
......@@ -11,8 +11,8 @@ class CRM_Utils_TokenTest extends CiviUnitTestCase {
*/
public function testGetTokenDetails() {
$contactID = $this->individualCreate(['preferred_communication_method' => ['Phone', 'Fax']]);
$resolvedTokens = CRM_Utils_Token::getTokenDetails([$contactID]);
$this->assertEquals('Phone, Fax', $resolvedTokens[0][$contactID]['preferred_communication_method']);
[$resolvedTokens] = CRM_Utils_Token::getTokenDetails([$contactID]);
$this->assertEquals('Phone, Fax', $resolvedTokens[$contactID]['preferred_communication_method']);
}
/**
......@@ -49,8 +49,8 @@ class CRM_Utils_TokenTest extends CiviUnitTestCase {
$contactIDs = [$contactID];
// when we are fetching contact details ON basis of primary address fields
$contactDetails = CRM_Utils_Token::getTokenDetails($contactIDs);
$this->assertEquals($primaryEmail, $contactDetails[0][$contactID]['email']);
[$contactDetails] = CRM_Utils_Token::getTokenDetails($contactIDs);
$this->assertEquals($primaryEmail, $contactDetails[$contactID]['email']);
// restore setting
Civi::settings()->set('searchPrimaryDetailsOnly', '1');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment