Use null coalescing to simplify combined search templates. (#3118)

vufind-org · Sep 22, 2023 · c07a8b9 · c07a8b9
1 parent 3c7b1ab
commit c07a8b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/themes/bootstrap3/templates/combined/results-list.phtml b/themes/bootstrap3/templates/combined/results-list.phtml
@@ -15,7 +15,7 @@
     ? $this->url($advancedSearchAction, [], ['query' => ['edit' => $results->getSearchId()]])
     : false;
 ?>
-<?php if (isset($currentSearch['more_link']) && $currentSearch['more_link']): ?>
+<?php if ($currentSearch['more_link'] ?? false): ?>
   <div class="pull-right flip">
     <a href="<?=$moreUrl?>" class="btn btn-link icon-link">
       <?=$this->icon('options', 'icon-link__icon') ?>
@@ -85,7 +85,7 @@
     ];
   ?>
   <?=$this->render('search/list-' . $viewType . '.phtml', $viewParams)?>
-  <?php if (isset($currentSearch['more_link']) && $currentSearch['more_link']): ?>
+  <?php if ($currentSearch['more_link'] ?? false): ?>
     <p class="more_link_bottom">
       <a class="icon-link" href="<?=$moreUrl?>">
         <span class="icon-link__label"><?=$this->transEsc($currentSearch['more_link'])?></span>

diff --git a/themes/bootstrap3/templates/combined/stack-distributed.phtml b/themes/bootstrap3/templates/combined/stack-distributed.phtml
@@ -4,9 +4,9 @@
   <?php foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
     <?php
       if (
-        (!isset($currentSearch['ajax']) || !$currentSearch['ajax'])                    // AJAX column
-        && (isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty']) // set to hide when empty
-        && $currentSearch['view']->results->getResultTotal() == 0                      // and empty
+        !($currentSearch['ajax'] ?? false)                        // AJAX column
+        && ($currentSearch['hide_if_empty'] ?? false)             // set to hide when empty
+        && $currentSearch['view']->results->getResultTotal() == 0 // and empty
       ) {
         continue;
       }
@@ -36,7 +36,7 @@
     <div class="combined-column">
       <?php foreach ($currColumn as $colParams): ?>
         <div id="<?=$this->escapeHtmlAttr($colParams['domId'])?>" class="combined-list">
-          <?php $templateSuffix = (isset($colParams['ajax']) && $colParams['ajax']) ? 'ajax' : 'list'; ?>
+          <?php $templateSuffix = ($colParams['ajax'] ?? false) ? 'ajax' : 'list'; ?>
           <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $colParams)?>
         </div>
       <?php endforeach; ?>

diff --git a/themes/bootstrap3/templates/combined/stack-left.phtml b/themes/bootstrap3/templates/combined/stack-left.phtml
@@ -15,9 +15,9 @@
       ?>
       <?php
         if (
-          (!isset($currentSearch['ajax']) || !$currentSearch['ajax'])                    // AJAX column
-          && (isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty']) // set to hide when empty
-          && $currentSearch['view']->results->getResultTotal() == 0                      // and empty
+          !($currentSearch['ajax'] ?? false)                        // AJAX column
+          && ($currentSearch['hide_if_empty'] ?? false)             // set to hide when empty
+          && $currentSearch['view']->results->getResultTotal() == 0 // and empty
         ) {
           continue;
         }
@@ -34,15 +34,15 @@
         }
       ?>
       <div id="<?=$this->escapeHtmlAttr($currentSearch['domId'])?>" class="combined-list">
-        <?php $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
+        <?php $templateSuffix = ($currentSearch['ajax'] ?? false) ? 'ajax' : 'list'; ?>
         <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $viewParams)?>
       </div>
     <?php endforeach; ?>
   </div>
   <?php foreach ($rightColumns as $colParams): ?>
     <div class="combined-column">
       <div id="<?=$this->escapeHtmlAttr($colParams['domId'])?>" class="combined-list">
-        <?php $templateSuffix = (isset($colParams['ajax']) && $colParams['ajax']) ? 'ajax' : 'list'; ?>
+        <?php $templateSuffix = ($colParams['ajax'] ?? false) ? 'ajax' : 'list'; ?>
         <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $colParams)?>
       </div>
     </div>

diff --git a/themes/bootstrap3/templates/combined/stack-right.phtml b/themes/bootstrap3/templates/combined/stack-right.phtml
@@ -14,15 +14,15 @@
       ?>
       <?php
         if (
-          (!isset($currentSearch['ajax']) || !$currentSearch['ajax'])                    // AJAX column
-          && (isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty']) // set to hide when empty
-          && $currentSearch['view']->results->getResultTotal() == 0                      // and empty
+          !($currentSearch['ajax'] ?? false)                        // AJAX column
+          && ($currentSearch['hide_if_empty'] ?? false)             // set to hide when empty
+          && $currentSearch['view']->results->getResultTotal() == 0 // and empty
         ) {
           continue;
         }
       ?>
       <div id="<?=$this->escapeHtmlAttr($currentSearch['domId'])?>" class="combined-list">
-        <?php $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
+        <?php $templateSuffix = ($currentSearch['ajax'] ?? false) ? 'ajax' : 'list'; ?>
         <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $viewParams)?>
       </div>
       <?php $columnIndex ++; ?>