Merged r8909 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8910 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-19 15:41:24 +00:00 · 2012-02-19 15:41:24 +00:00 · 26db0de8cc
commit 26db0de8cc
parent f8875ee513
1 changed files with 5 additions and 1 deletions
--- 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