X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FTokens.php;h=efde6376b2e261e0919c6229a9d5327967a9272f;hb=2fdaf616a03b4bf0d15587904f56014d4a04b65d;hp=8069d8335e699c128ad1d09451d0d74e84be6ef2;hpb=01fcf9d6be949c51b4a3eb1b2c1511ddb8c88f79;p=civicrm-core.git

diff --git a/CRM/Mailing/Tokens.php b/CRM/Mailing/Tokens.php
index 8069d8335e..efde6376b2 100644
--- a/CRM/Mailing/Tokens.php
+++ b/CRM/Mailing/Tokens.php
@@ -40,7 +40,7 @@ class CRM_Mailing_Tokens extends \Civi\Token\AbstractTokenSubscriber {
    * Class constructor.
    */
   public function __construct() {
-    parent::__construct('mailing', array(
+    parent::__construct('mailing', [
       'id' => ts('Mailing ID'),
       'name' => ts('Mailing Name'),
       'group' => ts('Mailing Group(s)'),
@@ -54,14 +54,15 @@ class CRM_Mailing_Tokens extends \Civi\Token\AbstractTokenSubscriber {
       'approveUrl' => ts('Mailing Approval URL'),
       'creator' => ts('Mailing Creator (Name)'),
       'creatorEmail' => ts('Mailing Creator (Email)'),
-    ));
+    ]);
   }
 
   /**
    * @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']);
   }
 
   /**
@@ -78,9 +79,9 @@ class CRM_Mailing_Tokens extends \Civi\Token\AbstractTokenSubscriber {
       ? $processor->context['mailing']
       : CRM_Mailing_BAO_Mailing::findById($processor->context['mailingId']);
 
-    return array(
+    return [
       'mailing' => $mailing,
-    );
+    ];
   }
 
   /**