diff options
| author | Simon Rettberg | 2019-04-09 11:39:47 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-04-09 11:39:47 +0200 |
| commit | 65d94131b76ddef5a0788bc543452534e7faf918 (patch) | |
| tree | 52c6d48b16ad28c631d67003b9664d65bc827b39 /modules-available/baseconfig/api.inc.php | |
| parent | [locationinfo] Update translations (diff) | |
| download | slx-admin-65d94131b76ddef5a0788bc543452534e7faf918.tar.gz slx-admin-65d94131b76ddef5a0788bc543452534e7faf918.tar.xz slx-admin-65d94131b76ddef5a0788bc543452534e7faf918.zip | |
[baseconfig] Remove "enabled" checkbox, reset field on override disable
Diffstat (limited to 'modules-available/baseconfig/api.inc.php')
| -rw-r--r-- | modules-available/baseconfig/api.inc.php | 9 |
1 files changed, 2 insertions, 7 deletions
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 |