From ededcdabd221afa9be20f5314ec3c12a548cee1c Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Wed, 6 Mar 2019 12:34:28 -0500
Subject: [PATCH] dev/core#644 fix from address before calling hook

---
 CRM/Core/BAO/MessageTemplate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index ff6813e716..d9fa8f2f7c 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -387,13 +387,13 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
     );
     $params = array_merge($defaults, $params);
 
-    CRM_Utils_Hook::alterMailParams($params, 'messageTemplate');
-
     // Core#644 - handle contact ID passed as "From".
     if (isset($params['from'])) {
       $params['from'] = CRM_Utils_Mail::formatFromAddress($params['from']);
     }
 
+    CRM_Utils_Hook::alterMailParams($params, 'messageTemplate');
+
     if ((!$params['groupName'] ||
         !$params['valueName']
       ) &&
-- 
2.25.1