From 1418b5afc7a70a6afb5cf98351408ae03592ae24 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 7 Sep 2024 09:21:09 -0600 Subject: [PATCH] Fix the new default setting custom search --- core/default_settings/default_settings.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index c70324715a..5c1f477daf 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -392,22 +392,26 @@ $row['default_setting_enabled'] = 'false'; } + //set the font weight, default value and filter for non-custom settings if (!empty($field)) { //check for custom settings filter - if ($custom_settings) { - $setting_bold = 'font-weight:bold;'; - continue; - } if ($row['default_setting_value'] !== $field['default_setting_value']) { $setting_bold = 'font-weight:bold;'; } + + //set the default value if (!empty($field['default_setting_value'])) { $default_value = 'Default: '.$field['default_setting_value']; } else { $default_value = 'Default: null'; } - if ($row['default_setting_enabled'] != $field['default_setting_enabled']) { + + //check if default enabled + if ($row['default_setting_enabled'] == $field['default_setting_enabled']) { + if ($custom_settings) { continue; } + } + else { $default_enabled = $field['default_setting_enabled']; $enabled_bold = true; }