From fa373cad8ba69d5dd8b0dd554b64ffbf13d1ad6c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 29 Apr 2019 16:59:35 -0700
Subject: [PATCH] CiviMail - Restore support for previewing mailing-tokens via
 TokenProcessor/Flexmailer

See preceding commit for general description - this simply applies the same
concept for another set of tokens.
---
 CRM/Mailing/Tokens.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Mailing/Tokens.php b/CRM/Mailing/Tokens.php
index 74cd6adee4..efde6376b2 100644
--- a/CRM/Mailing/Tokens.php
+++ b/CRM/Mailing/Tokens.php
@@ -61,7 +61,8 @@ class CRM_Mailing_Tokens extends \Civi\Token\AbstractTokenSubscriber {
    * @inheritDoc
    */
   public function checkActive(\Civi\Token\TokenProcessor $processor) {
-    return !empty($processor->context['mailingId']) || !empty($processor->context['mailing']);
+    return !empty($processor->context['mailingId']) || !empty($processor->context['mailing'])
+      || in_array('mailingId', $processor->context['schema']) || in_array('mailing', $processor->context['schema']);
   }
 
   /**
-- 
2.25.1