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 addressee, email_greeting_id, postal_greeting_id from exposed tokens #19782

Merged
merged 1 commit into from
Mar 11, 2021
Merged

Remove addressee, email_greeting_id, postal_greeting_id from exposed tokens #19782

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions CRM/Core/SelectValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ public static function contactTokens() {
'legal_identifier',
'contact_sub_type',
'user_unique_id',
'addressee_id',
'email_greeting_id',
'postal_greeting_id',
];

$customFields = CRM_Core_BAO_CustomField::getFields(['Individual', 'Address']);
Expand Down
6 changes: 0 additions & 6 deletions tests/phpunit/CRM/Core/BAO/MessageTemplateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ public function testContactTokens(): void {
individual_suffix:II
formal_title:Dogsbody
communication_style:Formal
email_greeting_id:Dear {contact.first_name}
postal_greeting_id:Dear {contact.first_name}
addressee_id:{contact.individual_prefix}{ } {contact.first_name}{ }{contact.middle_name}{ }{contact.last_name}{ }{contact.individual_suffix}
job_title:Busy person
gender:Female
birth_date:December 31st, 1998
Expand Down Expand Up @@ -317,9 +314,6 @@ public function getAllContactTokens(): array {
'individual_suffix' => 'II',
'formal_title' => 'Dogsbody',
'communication_style' => 'Formal',
'email_greeting_id' => 1,
'postal_greeting_id' => 1,
'addressee_id' => 1,
'job_title' => 'Busy person',
'gender' => 'Female',
'birth_date' => '1998-12-31',
Expand Down