From 8eba883d8a5378b8545ff0954b9ec84449f25ebf Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 29 Sep 2023 18:38:27 +1300
Subject: [PATCH] Fix Smarty help text block

---
 CRM/Core/Smarty/plugins/block.htxt.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Smarty/plugins/block.htxt.php b/CRM/Core/Smarty/plugins/block.htxt.php
index b206cb616c..cc58bda773 100644
--- a/CRM/Core/Smarty/plugins/block.htxt.php
+++ b/CRM/Core/Smarty/plugins/block.htxt.php
@@ -32,12 +32,10 @@
  * @return string|null
  *   the string, translated by gettext
  */
-function smarty_block_htxt($params, $text, &$smarty, &$repeat) {
-  if (!$repeat && $params['id'] == $smarty->_tpl_vars['id']) {
+function smarty_block_htxt($params, $text, $smarty, &$repeat) {
+  if (!$repeat && $params['id'] == $smarty->getTemplateVars('id')) {
     $smarty->assign('override_help_text', !empty($params['override']));
     return $text;
   }
-  else {
-    return NULL;
-  }
+  return NULL;
 }
-- 
2.25.1