diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb index c9de7b2b280..b8ff9fdc184 100644 --- a/app/models/global_setting.rb +++ b/app/models/global_setting.rb @@ -52,7 +52,8 @@ class GlobalSetting def lookup(key,default) - resolve(@data[key], default) + var = @data[key] + resolve(var, var.nil? ? default : "") end