github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 03:15:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move comment to the right place.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-06-29 15:23:29 +08:00
parent 8db3ab5f2a
commit 918b015bdb
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/site_setting_extension.rb
View File

@ -117,9 +117,6 @@ module SiteSettingExtension
hidden_settings << name
end
# You can "shadow" a site setting with a GlobalSetting. If the GlobalSetting
# exists it will be used instead of the setting and the setting will be hidden.
# Useful for things like API keys on multisite.
if opts[:shadowed_by_global] && GlobalSetting.respond_to?(name)
val = GlobalSetting.send(name)
unless val.nil? || (val == ''.freeze)