From f509e7b350108b16067ffa418dc51976d23eb193 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 29 Nov 2021 14:43:10 +1300
Subject: [PATCH] Ensure activityTypeFile is always assigned

---
 CRM/Activity/Form/Activity.php           | 9 ++++-----
 templates/CRM/Activity/Form/Activity.tpl | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index ac0ba84bec..8b7416e555 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -462,12 +462,11 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     CRM_Core_BAO_File::buildAttachment($this, 'civicrm_activity', $this->_activityId, NULL, TRUE);
 
     // figure out the file name for activity type, if any
-    if ($this->_activityTypeId &&
-      $this->_activityTypeFile = CRM_Activity_BAO_Activity::getFileForActivityTypeId($this->_activityTypeId, $this->_crmDir)
-    ) {
-      $this->assign('activityTypeFile', $this->_activityTypeFile);
-      $this->assign('crmDir', $this->_crmDir);
+    if ($this->_activityTypeId) {
+      $this->_activityTypeFile = CRM_Activity_BAO_Activity::getFileForActivityTypeId($this->_activityTypeId, $this->_crmDir);
     }
+    $this->assign('activityTypeFile', $this->_activityTypeFile);
+    $this->assign('crmDir', $this->_crmDir);
 
     $this->setFields();
 
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 6be2f9672c..9419cec0dc 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -91,8 +91,8 @@
       </td>
   </tr>
 
-  {if !empty($activityTypeFile)}
-  {include file="CRM/$crmDir/Form/Activity/$activityTypeFile.tpl"}
+  {if $activityTypeFile}
+    {include file="CRM/$crmDir/Form/Activity/$activityTypeFile.tpl"}
   {/if}
 
   <tr class="crm-activity-form-block-subject">
-- 
2.25.1