From 570eb116c05a37e50a0ae53c0172265979503401 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 5 Jan 2022 11:49:42 +1300
Subject: [PATCH] Do not escape showHideBlocks by default

Affects civicrm/acl?action=add&reset=1
---
 CRM/Core/ShowHideBlocks.php       | 1 +
 templates/CRM/common/showHide.tpl | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/ShowHideBlocks.php b/CRM/Core/ShowHideBlocks.php
index 1b4786987c..9166682c09 100644
--- a/CRM/Core/ShowHideBlocks.php
+++ b/CRM/Core/ShowHideBlocks.php
@@ -81,6 +81,7 @@ class CRM_Core_ShowHideBlocks {
     }
 
     $template = CRM_Core_Smarty::singleton();
+    $template->ensureVariablesAreAssigned(['elemType']);
     $template->assign_by_ref('hideBlocks', $hide);
     $template->assign_by_ref('showBlocks', $show);
   }
diff --git a/templates/CRM/common/showHide.tpl b/templates/CRM/common/showHide.tpl
index b750893aca..d30954364b 100644
--- a/templates/CRM/common/showHide.tpl
+++ b/templates/CRM/common/showHide.tpl
@@ -9,8 +9,8 @@
 *}
 {* This included tpl hides and displays the appropriate blocks as directed by the php code which assigns showBlocks and hideBlocks arrays. *}
  <script type="text/javascript">
-    var showBlocks = new Array({$showBlocks});
-    var hideBlocks = new Array({$hideBlocks});
+    var showBlocks = new Array({$showBlocks|smarty:nodefaults});
+    var hideBlocks = new Array({$hideBlocks|smarty:nodefaults});
 
-    on_load_init_blocks( showBlocks, hideBlocks{if !empty($elemType) and $elemType EQ 'table-row'}, 'table-row'{/if} );
+    on_load_init_blocks( showBlocks, hideBlocks{if $elemType and $elemType EQ 'table-row'}, 'table-row'{/if} );
  </script>
-- 
2.25.1