From cc9326c29d995ebf3828c97d58c5bb4249d879d2 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 20 Dec 2013 17:09:51 +1100
Subject: [PATCH] existence in file always overrides
---
app/models/global_setting.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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