From 9d98d4f613358f9a13fa17edfbb477693b38bcaf Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 26 Nov 2021 15:51:21 +1300
Subject: [PATCH] Assign cgCount in Case custom data form

---
 CRM/Case/Form/CustomData.php             | 3 ++-
 templates/CRM/Custom/Form/CustomData.tpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Case/Form/CustomData.php b/CRM/Case/Form/CustomData.php
index 95a339c255..9e4bb5e2a0 100644
--- a/CRM/Case/Form/CustomData.php
+++ b/CRM/Case/Form/CustomData.php
@@ -74,6 +74,7 @@ class CRM_Case_Form_CustomData extends CRM_Core_Form {
     $this->assign('groupID', $this->_groupID);
     $this->assign('subType', $this->_subTypeID);
     $this->assign('contactID', $this->_contactID);
+    $this->assign('cgCount');
   }
 
   /**
@@ -148,7 +149,7 @@ class CRM_Case_Form_CustomData extends CRM_Core_Form {
   public function formatCustomDataChangesForDetail($params) {
     $formattedDetails = [];
     foreach ($params as $customField => $newCustomValue) {
-      if (substr($customField, 0, 7) == 'custom_') {
+      if (substr($customField, 0, 7) === 'custom_') {
         if (($this->_defaults[$customField] ?? '') === $newCustomValue) {
           // Don't show values that did not change
           continue;
diff --git a/templates/CRM/Custom/Form/CustomData.tpl b/templates/CRM/Custom/Form/CustomData.tpl
index 1464225f44..1b1cb103e7 100644
--- a/templates/CRM/Custom/Form/CustomData.tpl
+++ b/templates/CRM/Custom/Form/CustomData.tpl
@@ -34,7 +34,7 @@
       </div>
      </div>
     {/if}
-    {if isset($cgCount)}
+    {if $cgCount}
       <div id="custom_group_{$group_id}_{$cgCount}"></div>
     {else}
       <div id="custom_group_{$group_id}"></div>
-- 
2.25.1