Merge pull request civicrm#9874 from totten/master-acttok

(Regression) CRM_Mailing_ActionTokens - Degrade gracefully
monishdeb · Feb 28, 2017 · dac08d8 · dac08d8
2 parents 431f89f + fbd1f71
commit dac08d8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CRM/Mailing/ActionTokens.php b/CRM/Mailing/ActionTokens.php
@@ -61,6 +61,13 @@ public function __construct() {
     ));
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function checkActive(\Civi\Token\TokenProcessor $processor) {
+    return !empty($processor->context['mailingId']) || !empty($processor->context['mailing']);
+  }
+
   /**
    * @inheritDoc
    */