Do not escape showHideBlocks by default

Affects civicrm/acl?action=add&reset=1

diff --git a/CRM/Core/ShowHideBlocks.php b/CRM/Core/ShowHideBlocks.php
index 1b4786987c947d969f8f3878f3104d76f22e727c..9166682c09b72dcd933b4a65917e86b285f97288 100644 (file)
--- 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 b750893acabbdb1521b8f9c191c57b94fdc06818..d30954364b7efa819b28fa6a2b49a7892a815e74 100644 (file)
--- 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>