@@ -103,12 +103,9 @@ class Setting < ActiveRecord::Base SETTINGS end - def settings_in_db - @settings_in_db ||= Setting.all - end - def update_from_yaml(filename) settings = YAML::load(File.open(filename)) + settings_in_db = Setting.all # per site settings Site.find(:all).each do |site| update_site_from_hash(site, settings) @@ -125,6 +122,7 @@ class Setting < ActiveRecord::Base end def update_site_from_hash(site, settings) + settings_in_db = Setting.all settings.each do |section_name, section| section.each do |setting_name, setting| next if setting['global'] app/models/setting.rb a16178c75a3808ab05cddefbc6963dfc8dd622db Tim Morgan seven1m tim@timmorgan.org http://github.com/seven1m/onebody/commit/c23daf4200eb51f35fdbcb80de0d6dfebbff6313 c23daf4200eb51f35fdbcb80de0d6dfebbff6313 2009-10-23T23:15:32-07:00 2009-10-23T23:15:32-07:00 Don't cache settings -- causes duplicates in some cases. f9e02b306eb2664c9a9e962910937110363ab722 Tim Morgan seven1m tim@timmorgan.org