Merge pull request #14499 from mattwire/extract_getdefaultroleid

[civicrm-core.git] / CRM / Mailing / Tokens.php

diff --git a/CRM/Mailing/Tokens.php b/CRM/Mailing/Tokens.php
index 74cd6adee41dc14b2e761d96bb0aede1127846ad..efde6376b2e261e0919c6229a9d5327967a9272f 100644 (file)
--- 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']);
   }
 
   /**