mirror of
https://github.com/discourse/discourse.git
synced 2025-06-06 03:06:53 +08:00
Revert "FIX: refresh
should work with shadowed globals"
This reverts commit 226f4b5bd96f03ca6ba2d9f025074dfbdbc0200c.
This commit is contained in:
@ -200,9 +200,11 @@ module SiteSettingExtension
|
||||
|
||||
if deletions.length > 0 || changes.length > 0
|
||||
changes.each do |name, val|
|
||||
next if shadowed_settings.include?(name)
|
||||
current[name] = val
|
||||
end
|
||||
deletions.each do |name,val|
|
||||
next if shadowed_settings.include?(name)
|
||||
current[name] = defaults[name]
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user