From 0ae0cc755cb1c381ebd04989b04b3ff562988c12 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 9 Sep 2021 19:18:16 +1200
Subject: [PATCH] [REF] Remove cruft

As the comment says - it's weird. Also I found the related code has been removed
---
 Civi/Token/TokenCompatSubscriber.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index 9d745c1489..3ebc0a09f9 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -113,12 +113,6 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
         $contact = $row->context['contact'];
       }
 
-      if (!empty($row->context['tmpTokenParams'])) {
-        // merge activity tokens with contact array
-        // this is pretty weird.
-        $contact = array_merge($contact, $row->context['tmpTokenParams']);
-      }
-
       $contactArray = [$contactId => $contact];
       \CRM_Utils_Hook::tokenValues($contactArray,
         [$contactId],
-- 
2.25.1