From da419326be712f000b2b06a9bccfbb9e7e0fb848 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 4 Apr 2016 16:36:32 +1000 Subject: [PATCH] FIX: nil and blank string should not override a site setting --- lib/site_setting_extension.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 7912d8dbe..90870a467 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -121,7 +121,8 @@ 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) - unless (val = GlobalSetting.send(name)) == ''.freeze + val = GlobalSetting.send(name) + unless val.nil? || (val == ''.freeze) hidden_settings << name shadowed_settings << name current_value = val