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

Revert "FIX: refresh should work with shadowed globals"

Browse Source 
This reverts commit 226f4b5bd9.
This commit is contained in:
Robin Ward
2015-02-09 17:08:52 -05:00
parent 226f4b5bd9
commit 5d6f6c4887
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/site_setting_extension.rb
View File

@@ -200,9 +200,11 @@ module SiteSettingExtension
if deletions.length > 0 || changes.length > 0 if deletions.length > 0 || changes.length > 0
changes.each do |name, val| changes.each do |name, val|
next if shadowed_settings.include?(name)
current[name] = val current[name] = val
end end
deletions.each do |name,val| deletions.each do |name,val|
next if shadowed_settings.include?(name)
current[name] = defaults[name] current[name] = defaults[name]
end end
end end