From efb4a26555f986b63ac22c1fd5afba12e6f07dde Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 18 Jan 2021 14:57:12 +1300
Subject: [PATCH] [REF] Move code closer to where it is used

Simply moves a few lines of code so the actual usage is apparent
---
 CRM/Core/BAO/MessageTemplate.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index e32ab9d4ca..922fbbd26a 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -471,14 +471,12 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
 
     // replace tokens in the three elements (in subject as if it was the text body)
     $domain = CRM_Core_BAO_Domain::getDomain();
-    $hookTokens = [];
+
     $mailing = new CRM_Mailing_BAO_Mailing();
     $mailing->subject = $mailContent['subject'];
     $mailing->body_text = $mailContent['text'];
     $mailing->body_html = $mailContent['html'];
     $tokens = $mailing->getTokens();
-    CRM_Utils_Hook::tokens($hookTokens);
-    $categories = array_keys($hookTokens);
 
     $contactID = $params['contactId'] ?? NULL;
 
@@ -540,6 +538,9 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
       );
       $contact = $contactArray[$contactID];
 
+      $hookTokens = [];
+      CRM_Utils_Hook::tokens($hookTokens);
+      $categories = array_keys($hookTokens);
       $mailContent['subject'] = CRM_Utils_Token::replaceHookTokens($mailContent['subject'], $contact, $categories, TRUE);
       $mailContent['text'] = CRM_Utils_Token::replaceHookTokens($mailContent['text'], $contact, $categories, TRUE);
       $mailContent['html'] = CRM_Utils_Token::replaceHookTokens($mailContent['html'], $contact, $categories, TRUE);
-- 
2.25.1