From 1e96ac9e06994fdeda1e78631f1aa3ed0e3f28f3 Mon Sep 17 00:00:00 2001 From: Romano Licker Date: Thu, 15 Mar 2012 11:55:37 +0100 Subject: [PATCH] [#935] Setting improperly set up for default values having a fixed call order resolves a problem where 'value=' was called before 'name=' resulting in no serialization --- app/models/setting.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 581766de..a9a11d4e 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -185,8 +185,10 @@ private def self.find_or_default(name) name = name.to_s raise "There's no setting named #{name}" unless @@available_settings.has_key?(name) - setting = find_by_name(name) - setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name + find_by_name(name) or new do |s| + s.name = name + s.value = @@available_settings[name]['default'] + end end def self.cache_key(name)