From 5efc1849b490ca0d6f5a3ec09776d8479d7f6005 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 30 Dec 2020 17:16:15 +0100 Subject: [PATCH] fix hide-incompatible-settings feature Signed-off-by: Michael Kaufmann --- lib/Froxlor/UI/Form.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/UI/Form.php b/lib/Froxlor/UI/Form.php index f91cadc5..766462c7 100644 --- a/lib/Froxlor/UI/Form.php +++ b/lib/Froxlor/UI/Form.php @@ -428,7 +428,7 @@ class Form if (isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) { $websrv = Settings::Get('system.webserver'); if (! in_array($websrv, $fielddata['websrv_avail'])) { - $do_show = Settings::Get('system.hide_incompatible_settings') == '1' ? false : true; + $do_show = false; $fielddata['label'] .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail'])); } } @@ -439,12 +439,11 @@ class Form if (isset($fielddata['visible']) && $do_show) { $do_show = $fielddata['visible']; if (! $do_show) { - $do_show = Settings::Get('system.hide_incompatible_settings') == '1' ? false : true; $fielddata['label'] .= $lng['serversettings']['option_unavailable']; } } - if ($do_show) { + if ($do_show || (!$do_show && Settings::Get('system.hide_incompatible_settings') == '0')) { $returnvalue = call_user_func(array( '\\Froxlor\\UI\\Fields', 'getFormFieldOutput' . ucfirst($fielddata['type'])