From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue, 16 Feb 2016 09:47:14 +0000 (+0530)
Subject: CRM-11153 -- custom tokens not replaced for schedule reminder
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=051938c6eeb79b84ad8024959b6b242b4519bd53;p=civicrm-core.git

CRM-11153 -- custom tokens not replaced for schedule reminder
---

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);
     }
   }