From dfbda5e59be110551dd6d8063e11a40770fe30e1 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 27 Nov 2017 21:31:19 -0800 Subject: [PATCH] CRM-21472 - Flag methods made redundant by FlexMailer's validator --- CRM/Mailing/BAO/Mailing.php | 2 ++ CRM/Utils/Token.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index a7665a36a4..0bd1fa660e 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1817,6 +1817,8 @@ ORDER BY civicrm_email.is_bulkmail DESC } /** + * @deprecated + * This is used by CiviMail but will be made redundant by FlexMailer. * @param CRM_Mailing_DAO_Mailing $mailing * The mailing which may or may not be sendable. * @return array diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 5b5b358c4f..1e71d311ec 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -90,6 +90,8 @@ class CRM_Utils_Token { /** + * @deprecated + * This is used by CiviMail but will be made redundant by FlexMailer. * @return array */ public static function getRequiredTokens() { -- 2.25.1