From a234efb5aa3862d3982da1dffa94b7ad633509b2 Mon Sep 17 00:00:00 2001 From: Justin Freeman Date: Wed, 8 Nov 2023 16:13:47 +1100 Subject: [PATCH] CIVICRM-2190 CiviCRM defaults, incorrectly describes opt-out action as "unsubscribe" which confuses users and site owners alike --- sql/civicrm_data/civicrm_mailing_component.sqldata.php | 4 ++-- tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/civicrm_data/civicrm_mailing_component.sqldata.php b/sql/civicrm_data/civicrm_mailing_component.sqldata.php index 7c9d2ee5dd..4bc340c09a 100644 --- a/sql/civicrm_data/civicrm_mailing_component.sqldata.php +++ b/sql/civicrm_data/civicrm_mailing_component.sqldata.php @@ -24,8 +24,8 @@ return CRM_Core_CodeGen_SqlData::create('civicrm_mailing_component') 'name' => ts("Mailing Footer"), "component_type" => "Footer", 'subject' => ts("Descriptive Title for this Footer."), - 'body_html' => ts('Sample Footer for HTML formatted content
Unsubscribe
{domain.address}'), - 'body_text' => ts("to unsubscribe: {action.optOutUrl}\n{domain.address}"), + 'body_html' => ts('Sample Footer for HTML formatted content
Opt out of any future emails
{domain.address}'), + 'body_text' => ts("Opt out of any future emails: {action.optOutUrl}\n{domain.address}"), ], [ 'name' => ts('Subscribe Message'), diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php index ec0b581f2d..e4744a12d3 100644 --- a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php +++ b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php @@ -165,7 +165,7 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase { // body_html, filtered "You can go to \\[Google\\]\\(http://example.net/first\?cs=[0-9a-f_]+\\) or \\[opt out\\]\\(http.*civicrm/mailing/optout.*\\)\\.\n" . // Default footer - "to unsubscribe: http.*civicrm/mailing/optout" . + "Opt out of any future emails: http.*civicrm/mailing/optout" . ";", $textPart->text ); -- 2.25.1