From 04651423548f1b22e7337cff2c4abfaa7e997f19 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Sat, 24 Jun 2023 12:18:45 -0700
Subject: [PATCH] REF - Code cleanup and notice fixes in scheduled reminders

---
 CRM/Activity/ActionMapping.php                  | 7 +++----
 CRM/Admin/Form/ScheduleReminders.php            | 2 +-
 templates/CRM/Admin/Form/ScheduleReminders.tpl  | 2 +-
 templates/CRM/Contact/Form/Task/EmailCommon.tpl | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CRM/Activity/ActionMapping.php b/CRM/Activity/ActionMapping.php
index 9f73592644..5618a2eb15 100644
--- a/CRM/Activity/ActionMapping.php
+++ b/CRM/Activity/ActionMapping.php
@@ -18,10 +18,9 @@
 /**
  * Class CRM_Activity_ActionMapping
  *
- * This defines the scheduled-reminder functionality for contact
- * entities. It is useful for, e.g., sending a reminder based on
- * birth date, modification date, or other custom dates on
- * the contact record.
+ * This defines the scheduled-reminder functionality for Activities.
+ * It is useful for, e.g., sending a reminder based on scheduled
+ * date or other custom dates on the activity record.
  */
 class CRM_Activity_ActionMapping extends \Civi\ActionSchedule\Mapping {
 
diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php
index e042bae1d6..2bfed1eb70 100644
--- a/CRM/Admin/Form/ScheduleReminders.php
+++ b/CRM/Admin/Form/ScheduleReminders.php
@@ -108,7 +108,7 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
     );
 
     $mappings = CRM_Core_BAO_ActionSchedule::getMappings();
-    $selectedMapping = $mappings[$mappingID ? $mappingID : 1];
+    $selectedMapping = $mappings[$mappingID ?: 1];
     $entityRecipientLabels = $selectedMapping->getRecipientTypes() + CRM_Core_BAO_ActionSchedule::getAdditionalRecipients();
     $this->assign('entityMapping', json_encode(
       CRM_Utils_Array::collectMethod('getEntity', $mappings)
diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl
index 592762f006..e58203ddbb 100644
--- a/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -122,7 +122,7 @@
             <td>
               {$form.subject.html|crmAddClass:huge}
               <input class="crm-token-selector big" data-field="subject" />
-              {help id="id-token-subject" tplFile=$tplFile isAdmin=$isAdmin file="CRM/Contact/Form/Task/Email.hlp"}
+              {help id="id-token-subject" file="CRM/Contact/Form/Task/Email.hlp"}
             </td>
          </tr>
        </table>
diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 644950ab62..98663a6357 100644
--- a/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -17,7 +17,7 @@
  <div class="crm-accordion-body">
   <div class="helpIcon" id="helphtml">
     <input class="crm-token-selector big" data-field="html_message" />
-    {help id="id-token-html" tplFile=$tplFile isAdmin=$isAdmin file="CRM/Contact/Form/Task/Email.hlp"}
+    {help id="id-token-html" file="CRM/Contact/Form/Task/Email.hlp"}
   </div>
   <div class="clear"></div>
     <div class='html'>
-- 
2.25.1