diff options
| -rw-r--r-- | modules-available/statistics/inc/hardwareinfo.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/statistics/inc/hardwarequerycolumn.inc.php | 4 |
2 files changed, 3 insertions, 3 deletions
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 +} |