Merge pull request #23321 from davejenx/report-column-nodisplay

PR 22070 follow-up: reinstate respecting no_display on report column headers
civicrm · May 3, 2022 · 31aa1eb · 31aa1eb
2 parents c0f0578 + 1845a10
commit 31aa1eb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -2507,10 +2507,12 @@ public function formatDisplay(&$rows, $pager = TRUE) {
       if (!empty($value['no_display'])) {
         unset($this->_columnHeaders[$key]);
       }
-      foreach (['colspan', 'type'] as $expectedKey) {
-        if (!isset($this->_columnHeaders[$key][$expectedKey])) {
-          // Ensure it is set to prevent smarty notices.
-          $this->_columnHeaders[$key][$expectedKey] = FALSE;
+      else {
+        foreach (['colspan', 'type'] as $expectedKey) {
+          if (!isset($this->_columnHeaders[$key][$expectedKey])) {
+            // Ensure it is set to prevent smarty notices.
+            $this->_columnHeaders[$key][$expectedKey] = FALSE;
+          }
         }
       }
     }