Remove smarty isset in favour of always set

civicrm · Nov 16, 2021 · c943622 · c943622
1 parent 48dbcda
commit c943622
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php
@@ -92,6 +92,9 @@ public function getDefaultEntity() {
    * Set up variables to build the form.
    */
   public function preProcess() {
+    // This variable does not appear to be set in core civicrm
+    // and is possibly obsolete? It probably relates to the multisite extension.
+    $this->expectedSmartyVariables[] = 'showOrgInfo';
     $this->_id = $this->get('id');
     if ($this->_id) {
       $breadCrumb = array(

diff --git a/CRM/Group/Form/Search.php b/CRM/Group/Form/Search.php
@@ -17,6 +17,9 @@
 class CRM_Group_Form_Search extends CRM_Core_Form {
 
   public function preProcess() {
+    // This variable does not appear to be set in core civicrm
+    // and is possibly obsolete? It probably relates to the multisite extension.
+    $this->expectedSmartyVariables[] = 'showOrgInfo';
     parent::preProcess();
 
     CRM_Core_Resources::singleton()->addPermissions('edit groups');

diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
@@ -136,7 +136,7 @@
           d.status = groupStatus,
           d.savedSearch = $('.crm-group-search-form-block select#saved_search').val(),
           d.component_mode = $(".crm-group-search-form-block select#component_mode").val(),
-          d.showOrgInfo = {/literal}{if isset($showOrgInfo)}"{$showOrgInfo}"{else}"0"{/if}{literal},
+          d.showOrgInfo = {/literal}{if $showOrgInfo}"{$showOrgInfo}"{else}"0"{/if}{literal},
           d.parentsOnly = parentsOnly
         }
       },
@@ -186,7 +186,7 @@
     // show hide children
     var context = $('#crm-main-content-wrapper');
     $('table.crm-group-selector', context).on( 'click', 'span.show-children', function(){
-      var showOrgInfo = {/literal}{if isset($showOrgInfo)}"{$showOrgInfo}"{else}"0"{/if}{literal};
+      var showOrgInfo = {/literal}{if $showOrgInfo}"{$showOrgInfo}"{else}"0"{/if}{literal};
       var rowID = $(this).parents('tr').prop('id');
       var parentRow = rowID.split('_');
       var parent_id = parentRow[1];

diff --git a/tests/phpunit/CRM/Core/Page/HookTest.php b/tests/phpunit/CRM/Core/Page/HookTest.php
@@ -69,7 +69,7 @@ public function setUp(): void {
   /**
    * Make sure form hooks are only invoked once.
    */
-  public function testFormsCallBuildFormOnce() {
+  public function testFormsCallBuildFormOnce(): void {
     CRM_Utils_Hook_UnitTests::singleton()->setHook('civicrm_buildForm', [$this, 'onBuildForm']);
     CRM_Utils_Hook_UnitTests::singleton()->setHook('civicrm_preProcess', [$this, 'onPreProcess']);
     $_REQUEST = ['action' => 'add'];