IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: remove site setting 'shadowed-by-global' option (#8061)

Browse Source
This commit is contained in:
Régis Hanol
2019-10-08 12:43:26 -04:00
committed by Robin Ward
parent b20b6c52e1
commit 349c1cd085
3 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/site_setting_extension.rb
View File

@@ -132,7 +132,7 @@ module SiteSettingExtension
hidden_settings << name
end
if opts[:shadowed_by_global] && GlobalSetting.respond_to?(name)
if GlobalSetting.respond_to?(name)
val = GlobalSetting.public_send(name)
unless val.nil? || (val == ''.freeze)