From 65d94131b76ddef5a0788bc543452534e7faf918 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 9 Apr 2019 11:39:47 +0200
Subject: [baseconfig] Remove "enabled" checkbox, reset field on override
 disable

Closes #3570
Closes #3569
---
 modules-available/baseconfig/api.inc.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'modules-available/baseconfig/api.inc.php')

diff --git a/modules-available/baseconfig/api.inc.php b/modules-available/baseconfig/api.inc.php
index bc834930..013640e7 100644
--- a/modules-available/baseconfig/api.inc.php
+++ b/modules-available/baseconfig/api.inc.php
@@ -157,16 +157,11 @@ $defaults = BaseConfigUtil::getVariables();
 
 // Dump global config from DB
 ConfigHolder::setContext('<global>');
-$res = Database::simpleQuery('SELECT setting, value, enabled FROM setting_global');
+$res = Database::simpleQuery('SELECT setting, value FROM setting_global');
 while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 	if (!isset($defaults[$row['setting']]))
 		continue; // Setting is not defined in any <module>/baseconfig/settings.json
-	if ($row['enabled'] != 1) {
-		// Setting is disabled
-		ConfigHolder::add($row['setting'], false, -1);
-	} else {
-		ConfigHolder::add($row['setting'], $row['value'], -1);
-	}
+	ConfigHolder::add($row['setting'], $row['value'], -1);
 }
 
 // Fallback to default values from json files
-- 
cgit v1.2.3-55-g7522