From 3e4d4a0c1af00542dd9f794c452df6614fc7e840 2013-12-20 11:54:23 From: Toshi MARUYAMA Date: 2013-12-20 11:54:23 Subject: [PATCH] Rails4 compatibility of Setting model git-svn-id: http://svn.redmine.org/redmine/trunk@12423 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/setting.rb b/app/models/setting.rb index b7a2a9b..baef558 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -242,9 +242,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 = where(:name => name).first unless setting - setting = new(:name => name) + setting = new + setting.name = name setting.value = @@available_settings[name]['default'] end setting