From d72434db91763c0e21213cf2f7a360e0cdff3c4b Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Mon, 17 Jun 2013 12:32:11 -0700 Subject: [PATCH] Applying patch to fix typo in recognition of unsubscribeUrl token and typo in form rule error. --- CRM/Utils/Token.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 1047ceca4b..00e96e07c6 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -104,12 +104,12 @@ class CRM_Utils_Token { if (self::$_requiredTokens == NULL) { self::$_requiredTokens = array( 'domain.address' => ts("Domain address - displays your organization's postal address."), - 'action.optOutUrl or action.subscribeUrl' => + 'action.optOutUrl or action.unsubscribeUrl' => array( 'action.optOut' => ts("'Opt out via email' - displays an email address for recipients to opt out of receiving emails from your organization."), 'action.optOutUrl' => ts("'Opt out via web page' - creates a link for recipients to click if they want to opt out of receiving emails from your organization. Alternatively, you can include the 'Opt out via email' token."), 'action.unsubscribe' => ts("'Unsubscribe via email' - displays an email address for recipients to unsubscribe from the specific mailing list used to send this message."), - 'action.unsubscribe' => ts("'Unsubscribe via web page' - creates a link for recipients to unsubscribe from the specific mailing list used to send this message. Alternatively, you can include the 'Unsubscribe via email' token or one of the Opt-out tokens."), + 'action.unsubscribeUrl' => ts("'Unsubscribe via web page' - creates a link for recipients to unsubscribe from the specific mailing list used to send this message. Alternatively, you can include the 'Unsubscribe via email' token or one of the Opt-out tokens."), ), ); } -- 2.25.1