Revert "FIX: refresh should work with shadowed globals"

This reverts commit 226f4b5bd96f03ca6ba2d9f025074dfbdbc0200c.
This commit is contained in:
Robin Ward
2015-02-09 17:08:52 -05:00
parent 226f4b5bd9
commit 5d6f6c4887

View File

@ -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