Merge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-h…

…ookTokenValues pass mailingJobId to hook_tokenValues
civicrm · Aug 3, 2018 · a215c54 · a215c54
2 parents 0786231 + 1b03e96
commit a215c54
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
@@ -90,7 +90,7 @@ public function onEvaluate(TokenValueEvent $e) {
       // less randomly.
       \CRM_Utils_Hook::tokenValues($contactArray,
         (array) $contactId,
-        empty($row->context['mailingJob']) ? NULL : $row->context['mailingJob']->id,
+        empty($row->context['mailingJobId']) ? NULL : $row->context['mailingJobId'],
         $messageTokens,
         $row->context['controller']
       );