A platform for community discussion. Free, open, simple.
FIX: Unconfigurable plugin site settings not properly excluded (#39023)
Martin Brennan5cb38fa3cc84
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rbindex f690c70a01b..c801a84eefc 100644--- a/lib/site_setting_extension.rb+++ b/lib/site_setting_extension.rb@@ -361,7 +361,7 @@ module SiteSettingExtensiondefaults.all(default_locale).reject do |setting_name, _|- plugins[name] && !Discourse.plugins_by_name[plugins[name]].configurable?+ plugins[setting_name] && !Discourse.plugins_by_name[plugins[setting_name]].configurable?end.select do |setting_name, _|is_hidden = current_hidden_settings.include?(setting_name)diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rbindex dd54685269a..3097faa798b 100644--- a/spec/lib/site_setting_extension_spec.rb+++ b/spec/lib/site_setting_extension_spec.rb@@ -1015,6 +1015,20 @@ RSpec.describe SiteSettingExtension doenddescribe ".all_settings" do+ describe "non-configurable plugin exclusion" do+ it "includes plugin site settings when the plugin is configurable" do+ SiteSetting::SAMPLE_TEST_PLUGIN.stubs(:configurable?).returns(true)++ expect(SiteSetting.all_settings.map { |s| s[:setting] }).to include(:plugin_setting)+ end++ it "excludes plugin site settings when the plugin is not configurable" do+ SiteSetting::SAMPLE_TEST_PLUGIN.stubs(:configurable?).returns(false)++ expect(SiteSetting.all_settings.map { |s| s[:setting] }).not_to include(:plugin_setting)+ end+ end+describe "uploads settings" doit "should return the right values" donegative_upload_id = [(Upload.minimum(:id) || 0) - 1, -10].min