From 7fcecefe51bd5169f3161b3e1566cda16df826c9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 22 Jun 2023 16:36:31 -0700
Subject: [PATCH] MessageTemplate - Be more forgiving about order of loading
 explicit message-template content

While rejuggling the order of operations in `renderTemplateRaw()`, this
helped some tests (like `testRenderDefaultTemplate()`) pass.
---
 CRM/Core/BAO/MessageTemplate.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index fdf9528205..9a5cef200c 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -465,8 +465,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate implemen
    */
   protected static function loadTemplate(string $workflowName, bool $isTest, int $messageTemplateID = NULL, $groupName = NULL, ?array $messageTemplateOverride = NULL, ?string $subjectOverride = NULL, ?string $language = NULL): array {
     $base = ['msg_subject' => NULL, 'msg_text' => NULL, 'msg_html' => NULL, 'pdf_format_id' => NULL];
-    if (!$workflowName && !$messageTemplateID) {
-      throw new CRM_Core_Exception(ts("Message template's option value or ID missing."));
+    if (!$workflowName && !$messageTemplateID && !$messageTemplateOverride) {
+      throw new CRM_Core_Exception(ts("Message template not specified. No option value, ID, or template content."));
     }
 
     $apiCall = MessageTemplate::get(FALSE)
@@ -477,11 +477,16 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate implemen
 
     if ($messageTemplateID) {
       $apiCall->addWhere('id', '=', (int) $messageTemplateID);
+      $result = $apiCall->execute();
     }
-    else {
+    elseif ($workflowName) {
       $apiCall->addWhere('workflow_name', '=', $workflowName);
+      $result = $apiCall->execute();
+    }
+    else {
+      // Don't bother with query. We know there's nothing.
+      $result = new \Civi\Api4\Generic\Result();
     }
-    $result = $apiCall->execute();
     $messageTemplate = array_merge($base, $result->first() ?: [], $messageTemplateOverride ?: []);
     if (empty($messageTemplate['id']) && empty($messageTemplateOverride)) {
       if ($messageTemplateID) {
-- 
2.25.1