From f0942607f943ca4939309cc28a5a9ddba6121b95 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 23 Mar 2022 10:45:54 +1300
Subject: [PATCH] Re-fix enotice on templateSelected

The empty check on templateSelected was added to stop tests failing on a smarty notice.

However, this still causes a smarty notice (and test fails) in grumpy smarty mode.

Hence this re-fixes in by moving the check to only be done for the from
(the sms Upload form) that assigns it
---
 templates/CRM/Mailing/Form/InsertTokens.tpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index b59f586744..3a43972bd3 100644
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -25,13 +25,20 @@ var isMailing    = false;
   text_message = "mailing_format";
   isMailing = false;
   {/literal}
-  {elseif $form.formClass eq 'CRM_SMS_Form_Upload' || $form.formClass eq 'CRM_Contact_Form_Task_SMS'}
+{elseif $form.formClass eq 'CRM_SMS_Form_Upload' || $form.formClass eq 'CRM_Contact_Form_Task_SMS'}
   {literal}
   prefix = "SMS";
   text_message = "sms_text_message";
   isMailing = true;
   {/literal}
-  {else}
+  {if $templateSelected}
+    {literal}
+      if ( document.getElementsByName(prefix + "saveTemplate")[0].checked ) {
+        document.getElementById(prefix + "template").selectedIndex = {/literal}{$templateSelected}{literal};
+      }
+    {/literal}
+  {/if}
+{else}
   {literal}
   text_message = "text_message";
   html_message = (cj("#edit-html-message-value").length > 0) ? "edit-html-message-value" : "html_message";
@@ -45,13 +52,6 @@ var isMailing    = false;
   {/literal}
 {/if}
 
-{if !empty($templateSelected)}
-  {literal}
-  if ( document.getElementsByName(prefix + "saveTemplate")[0].checked ) {
-    document.getElementById(prefix + "template").selectedIndex = {/literal}{$templateSelected}{literal};
-  }
-{/literal}
-{/if}
 {literal}
 
 /**
-- 
2.25.1