From 8b0d8f6f6c3b5601c5311e25cc86763122423435 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 18 Mar 2022 12:11:13 +0000
Subject: [PATCH] Clean activity getBespokeTokens

---
 CRM/Activity/Tokens.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/CRM/Activity/Tokens.php b/CRM/Activity/Tokens.php
index 697a98f0d6e5..beb85d40281c 100644
--- a/CRM/Activity/Tokens.php
+++ b/CRM/Activity/Tokens.php
@@ -101,16 +101,13 @@ public function evaluateToken(TokenRow $row, $entity, $field, $prefetch = NULL)
   protected function getBespokeTokens(): array {
     $tokens = [];
     if (CRM_Core_Component::isEnabled('CiviCase')) {
-      $tokens['case_id'] = ts('Activity Case ID');
-      return [
-        'case_id' => [
-          'title' => ts('Activity Case ID'),
-          'name' => 'case_id',
-          'type' => 'calculated',
-          'options' => NULL,
-          'data_type' => 'Integer',
-          'audience' => 'user',
-        ],
+      $tokens['case_id'] = [
+        'title' => ts('Activity Case ID'),
+        'name' => 'case_id',
+        'type' => 'calculated',
+        'options' => NULL,
+        'data_type' => 'Integer',
+        'audience' => 'user',
       ];
     }
     return $tokens;