From: Michael McAndrew <michaelmcandrew@thirdsectordesign.org>
Date: Tue, 24 Apr 2018 16:07:25 +0000 (+0100)
Subject: pass the mailing job id to hook token values
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b03e966c9e3433b724a7bedfde32fbe49389056;p=civicrm-core.git

pass the mailing job id to hook token values
---

diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index d00acd7509..8e2ac735ba 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -90,7 +90,7 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
       // 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']
       );