Avoid deprecated site setting logging in SiteSetting.settings_hash.

This commit is contained in:
Guo Xiang Tan
2018-11-20 11:59:38 +08:00
parent 81b3bdaabd
commit 1a57be3248
3 changed files with 16 additions and 8 deletions

View File

@ -177,9 +177,17 @@ module SiteSettingExtension
def settings_hash
result = {}
deprecated_settings = SiteSettings::DeprecatedSettings::SETTINGS.map { |s| s[0] }
defaults.all.keys.each do |s|
result[s] = send(s).to_s
result[s] =
if deprecated_settings.include?(s.to_s)
send(s, warn: false).to_s
else
send(s).to_s
end
end
result
end