Fix headers in flat list aggregations

Fixes #678
cosmocode · Nov 1, 2023 · 62c804c · 62c804c · splitbrain · Nov 1, 2023
1 parent 5827d73
commit 62c804c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/meta/AggregationList.php b/meta/AggregationList.php
@@ -89,11 +89,16 @@ protected function renderNode(NestedValue $node)
      */
     protected function renderListItem($resultrow, $depth, $showEmpty = false)
     {
-        $sepbyheaders = $this->searchConfig->getConf()['sepbyheaders'];
-        $headers = $this->searchConfig->getConf()['headers'];
+        $config = $this->searchConfig->getConf();
+        $sepbyheaders = $config['sepbyheaders'];
+        $headers = $config['headers'];
 
         foreach ($resultrow as $index => $value) {
-            $column = $index + $depth; // the resultrow is shifted by the nesting depth
+            // when nesting, the resultrow is shifted by the nesting depth
+            $column = $index;
+            if ($config['nesting']) {
+                $column += $depth;
+            }
             if ($sepbyheaders && !empty($headers[$column])) {
                 $header = $headers[$column];
             } else {

diff --git a/meta/ConfigParser.php b/meta/ConfigParser.php
@@ -279,14 +279,14 @@ protected function parseValues($line)
         $value = '';
         $len = strlen($line);
         for ($i = 0; $i < $len; $i++) {
-            if ($line[$i] == '"') {
+            if ($line[$i] === '"') {
                 if ($inQuote) {
                     if ($escapedQuote) {
                         $value .= '"';
                         $escapedQuote = false;
                         continue;
                     }
-                    if ($line[$i + 1] == '"') {
+                    if (isset($line[$i + 1]) && $line[$i + 1] === '"') {
                         $escapedQuote = true;
                         continue;
                     }
@@ -299,7 +299,7 @@ protected function parseValues($line)
                     $value = ''; //don't store stuff before the opening quote
                     continue;
                 }
-            } elseif ($line[$i] == ',') {
+            } elseif ($line[$i] === ',') {
                 if ($inQuote) {
                     $value .= ',';
                     continue;