From ce43a6dd58739d0c2eeb66351226c71f8bf6b0ee Mon Sep 17 00:00:00 2001 From: snapai Date: Fri, 26 Jul 2013 13:29:32 -0400 Subject: [PATCH] Correct setting.find_or_default to do what it says The previous "setting ||= find_by_name(name)" line failed to load settings (only overwrote the setting if it did not contain a default - a condition guaranteed by the previous conditional to never occur) --- app/models/setting.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 359ad7b3f5..cae76aa01e 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -261,7 +261,10 @@ def self.find_or_default(name) setting = new(:name => name) setting.value = @@available_settings[name]['default'] end - setting ||= find_by_name(name) + if find_by_name(name) + setting = find_by_name(name) + end + end end