allow nuking of vars via env

2013-12-20 17:07:08 +11:00 · 2013-12-20 17:07:08 +11:00 · 61a50f1cf6
parent 13e1016d73
commit 61a50f1cf6
1 changed files with 2 additions and 1 deletions
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@ -66,7 +66,8 @@ class GlobalSetting

  class EnvProvider < BaseProvider
    def lookup(key, default)
-      resolve(ENV["DISCOURSE_" << key.to_s.upcase], default)
+      var = ENV["DISCOURSE_" << key.to_s.upcase]
+      resolve(var , var.nil? ? default : nil)
    end
  end