X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FToken%2FTokenCompatSubscriber.php;h=3eaf57d3b7cc6ac6d92ccf948c9647a45825767b;hb=7e6a7f997516cc8cfee3724423181d1f9dc2fa78;hp=104d9f1117c51ac25e382a1cdc10c643eaff231f;hpb=8c22fd736896761e7b93862357eedc0ac2ac6ea9;p=civicrm-core.git

diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index 104d9f1117..3eaf57d3b7 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -83,6 +83,10 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
         $row->context['controller']
       );
 
+      // merge the custom tokens in the $contact array
+      if (!empty($contactArray[$contactId])) {
+        $contact = array_merge($contact, $contactArray[$contactId]);
+      }
       $row->context('contact', $contact);
     }
   }