@@ -11,6 +11,6 @@ class CreateMessages < ActiveRecord::Migration end def self.down - drop_table messages + drop_table :messages end end \ No newline at end of file db/migrate/059_create_messages.rb @@ -30,5 +30,12 @@ module ApplicationConfiguration config_hash = (users_app_config||{}).reverse_merge!(default_app_config) - ::AppConfig = OpenStruct.new config_hash + unless defined?(AppConfig) + ::AppConfig = OpenStruct.new config_hash + else + orig_hash = AppConfig.marshal_dump + merged_hash = config_hash.merge(orig_hash) + + AppConfig = OpenStruct.new merged_hash + end end \ No newline at end of file init.rb 4ae03a55eadc960567699fb22f0bab7eb8b7ce66 Bruno Bornsztein bruno@otis.local http://github.com/bborn/communityengine/commit/2e3bcf23975dffdaf7510c6ecf34d60d3d4e0958 2e3bcf23975dffdaf7510c6ecf34d60d3d4e0958 2008-12-30T12:56:30-08:00 2008-12-30T12:56:30-08:00 fix bug in drop messages migration, change AppConfig initialization to allow overriding 3674b459b2fb502951943428e6e268890e2e014f Bruno Bornsztein bruno@otis.local