Merge pull request civicrm#31037 from eileenmcnaughton/no_test

Remove blank place holders for text versions of messages
demeritcowboy · Sep 4, 2024 · 004fc0c · 004fc0c
2 parents 21a7248 + 0b610e8
commit 004fc0c
Show file tree

Hide file tree

Showing 34 changed files with 10 additions and 4 deletions.
diff --git a/CRM/Core/CodeGen/Util/MessageTemplates.php b/CRM/Core/CodeGen/Util/MessageTemplates.php
@@ -210,7 +210,6 @@ public static function assignSmartyVariables($smarty): void {
     $directory = self::getDirectory($smarty);
     foreach (array_keys($templates) as $name) {
       $templates[$name]['msg_html'] = file_get_contents($directory . '/' . $name . '_html.tpl');
-      $templates[$name]['msg_text'] = file_get_contents($directory . '/' . $name . '_text.tpl') ?: '';
       $templates[$name]['subject'] = file_get_contents($directory . '/' . $name . '_subject.tpl');
       $templates[$name]['name'] = $name;
     }

diff --git a/CRM/Upgrade/Incremental/MessageTemplates.php b/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -542,7 +542,14 @@ public function updateTemplates(): void {
       $workFlowID = CRM_Core_DAO::singleValueQuery('SELECT MAX(id) as id FROM civicrm_option_value WHERE name = %1', [
         1 => [$template['name'], 'String'],
       ]);
-      $content = file_get_contents(\Civi::paths()->getPath('[civicrm.root]/xml/templates/message_templates/' . $template['name'] . '_' . $template['type'] . '.tpl'));
+      if ($template['type'] === 'text') {
+        // We no longer ship text templates.
+        $content = '';
+      }
+      else {
+        $content = file_get_contents(\Civi::paths()
+          ->getPath('[civicrm.root]/xml/templates/message_templates/' . $template['name'] . '_' . $template['type'] . '.tpl'));
+      }
       $templatesToUpdate = [];
       if (!empty($workFlowID)) {
         // This could be empty if the template was deleted. It should not happen,

diff --git a/xml/templates/civicrm_msg_template.tpl b/xml/templates/civicrm_msg_template.tpl
@@ -27,12 +27,12 @@ INSERT INTO civicrm_option_group
     INSERT INTO civicrm_msg_template
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
-    ('{$template.title}', '{$template.subject|escape:"quotes"}', '{$template.msg_text|escape:"quotes"}', '{$template.msg_html|escape:"quotes"}', '{$template.name}', (SELECT id FROM civicrm_option_value WHERE name = '{$template.name}'), 1, 0);
+    ('{$template.title}', '{$template.subject|escape:"quotes"}', '', '{$template.msg_html|escape:"quotes"}', '{$template.name}', (SELECT id FROM civicrm_option_value WHERE name = '{$template.name}'), 1, 0);
 
     INSERT INTO civicrm_msg_template
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
-    ('{$template.title}', '{$template.subject|escape:"quotes"}', '{$template.msg_text|escape:"quotes"}', '{$template.msg_html|escape:"quotes"}', '{$template.name}', (SELECT id FROM civicrm_option_value WHERE name = '{$template.name}'), 0, 1);
+    ('{$template.title}', '{$template.subject|escape:"quotes"}', '', '{$template.msg_html|escape:"quotes"}', '{$template.name}', (SELECT id FROM civicrm_option_value WHERE name = '{$template.name}'), 0, 1);
   {else}
     INSERT INTO civicrm_msg_template
     (msg_text, msg_title, msg_subject, msg_html)

diff --git a/xml/templates/message_templates/case_activity_text.tpl b/xml/templates/message_templates/case_activity_text.tpl
diff --git a/xml/templates/message_templates/contribution_dupalert_text.tpl b/xml/templates/message_templates/contribution_dupalert_text.tpl
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_text.tpl b/xml/templates/message_templates/contribution_invoice_receipt_text.tpl
diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl
diff --git a/xml/templates/message_templates/contribution_recurring_billing_text.tpl b/xml/templates/message_templates/contribution_recurring_billing_text.tpl
diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl
diff --git a/xml/templates/message_templates/contribution_recurring_edit_text.tpl b/xml/templates/message_templates/contribution_recurring_edit_text.tpl
diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl
diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl
diff --git a/xml/templates/message_templates/friend_text.tpl b/xml/templates/message_templates/friend_text.tpl
diff --git a/xml/templates/message_templates/membership_autorenew_billing_text.tpl b/xml/templates/message_templates/membership_autorenew_billing_text.tpl
diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl
diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl
diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
diff --git a/xml/templates/message_templates/participant_cancelled_text.tpl b/xml/templates/message_templates/participant_cancelled_text.tpl
diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl
diff --git a/xml/templates/message_templates/participant_expired_text.tpl b/xml/templates/message_templates/participant_expired_text.tpl
diff --git a/xml/templates/message_templates/participant_transferred_text.tpl b/xml/templates/message_templates/participant_transferred_text.tpl
diff --git a/xml/templates/message_templates/payment_or_refund_notification_text.tpl b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
diff --git a/xml/templates/message_templates/pcp_notify_text.tpl b/xml/templates/message_templates/pcp_notify_text.tpl
diff --git a/xml/templates/message_templates/pcp_owner_notify_text.tpl b/xml/templates/message_templates/pcp_owner_notify_text.tpl
diff --git a/xml/templates/message_templates/pcp_status_change_text.tpl b/xml/templates/message_templates/pcp_status_change_text.tpl
diff --git a/xml/templates/message_templates/pcp_supporter_notify_text.tpl b/xml/templates/message_templates/pcp_supporter_notify_text.tpl
diff --git a/xml/templates/message_templates/petition_confirmation_needed_text.tpl b/xml/templates/message_templates/petition_confirmation_needed_text.tpl
diff --git a/xml/templates/message_templates/petition_sign_text.tpl b/xml/templates/message_templates/petition_sign_text.tpl
diff --git a/xml/templates/message_templates/pledge_acknowledge_text.tpl b/xml/templates/message_templates/pledge_acknowledge_text.tpl
diff --git a/xml/templates/message_templates/pledge_reminder_text.tpl b/xml/templates/message_templates/pledge_reminder_text.tpl
diff --git a/xml/templates/message_templates/test_preview_text.tpl b/xml/templates/message_templates/test_preview_text.tpl
diff --git a/xml/templates/message_templates/uf_notify_text.tpl b/xml/templates/message_templates/uf_notify_text.tpl