Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

FEATURE: blank global settings should not shadow

Browse source 
Due to https://github.com/docker/docker/issues/9298 it is a huge pain
to remove ENV vars when composing images, allow us to simply treat "blank"
as a ENV var that is not being shadowed. In general we always supply a
value to ENV vars we are shadowing.
This commit is contained in:
Sam Saffron 2016-02-10 11:54:40 +11:00
parent 8944d62aa6
commit d0dd517f27
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/site_setting_extension.rb
View file

@ -121,9 +121,11 @@ module SiteSettingExtension
# 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)
hidden_settings << name
shadowed_settings << name
current_value = GlobalSetting.send(name)
if (val = GlobalSetting.send(name)).present?
hidden_settings << name
shadowed_settings << name
current_value = val
end
end
if opts[:refresh]