From 5486173328d4488abbfc92011883336a214e6293 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 3 Nov 2020 13:47:44 +0100
Subject: [sysconfig] Display duplicate files for generated system config

Implements #3670
---
 modules-available/sysconfig/page.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules-available/sysconfig/page.inc.php')

diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index 64162294..ede80aa7 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -174,12 +174,12 @@ class Page_SysConfig extends Page
 	private function listConfigs()
 	{
 		// Configs
-		$res = Database::simpleQuery("SELECT c.configid, c.title, c.filepath, c.status, c.dateline,
+		$res = Database::simpleQuery("SELECT c.configid, c.title, c.filepath, c.status, c.dateline, c.warnings,
 				GROUP_CONCAT(DISTINCT cl.locationid) AS loclist, GROUP_CONCAT(DISTINCT cxm.moduleid) AS modlist
 			FROM configtgz c
 			LEFT JOIN configtgz_x_module cxm USING (configid)
 			LEFT JOIN configtgz_location cl ON (c.configid = cl.configid)
-			GROUP BY configid
+			GROUP BY configid, title
 			ORDER BY title ASC");
 		$configs = array();
 		if ($this->currentLoc !== 0) {
@@ -208,6 +208,7 @@ class Page_SysConfig extends Page
 				$this->haveOverriddenLocations = true;
 			}
 			$configs[] = array(
+				'warnings' => $row['warnings'],
 				'configid' => $row['configid'],
 				'config' => $row['title'],
 				'modlist' => $row['modlist'],
-- 
cgit v1.2.3-55-g7522