From 26db0de8cc744005d045263aaa9397800d07a659 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 19 Feb 2012 15:41:24 +0000 Subject: [PATCH] Merged r8909 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8910 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/setting.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 111193cae..0b4237537 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -169,6 +169,10 @@ private 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 + unless setting + setting = new(:name => name) + setting.value = @@available_settings[name]['default'] + end + setting end end -- 2.39.5