From 0fecb411c577fe91691d6ac6be322cbc05da9e48 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 19 Apr 2022 11:25:35 +0200
Subject: [statistics] Fix hwquery grouping

---
 modules-available/statistics/inc/hardwareinfo.inc.php        | 2 +-
 modules-available/statistics/inc/hardwarequerycolumn.inc.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/statistics/inc/hardwareinfo.inc.php b/modules-available/statistics/inc/hardwareinfo.inc.php
index 6ca070ee..36e99ba5 100644
--- a/modules-available/statistics/inc/hardwareinfo.inc.php
+++ b/modules-available/statistics/inc/hardwareinfo.inc.php
@@ -50,7 +50,7 @@ class HardwareInfo
 		$hw->addGlobalColumn('vendor');
 		$hw->addGlobalColumn('device');
 		$hw->addLocalColumn('slot');
-		$res = $hw->query();
+		$res = $hw->query(['vendor', 'device']);
 		$passthrough = [];
 		$slots = [];
 		$gvt = false;
diff --git a/modules-available/statistics/inc/hardwarequerycolumn.inc.php b/modules-available/statistics/inc/hardwarequerycolumn.inc.php
index 5e16bcd9..0f8574f1 100644
--- a/modules-available/statistics/inc/hardwarequerycolumn.inc.php
+++ b/modules-available/statistics/inc/hardwarequerycolumn.inc.php
@@ -53,7 +53,7 @@ class HardwareQueryColumn
 		// INNER JOIN, so the result will be empty if the condition doesn't match.
 		$type = count($this->conditions) === 1 ? 'LEFT' : 'INNER';
 		$joins[] = "$type JOIN $table $tid ON (" . implode(' AND ', $this->conditions) . ")";
-		if (!in_array($this->alias, $groupConcat)) {
+		if (!empty($groupConcat) && !in_array($this->alias, $groupConcat)) {
 			$columns[] = "Group_Concat(DISTINCT $tid.`value` SEPARATOR ', ') AS `{$this->alias}`";
 		} else {
 			$columns[] = "$tid.`value` AS `{$this->alias}`";
@@ -85,4 +85,4 @@ class HardwareQueryColumn
 		}
 	}
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-55-g7522