Merge branch 'development' of github.com:helma/opentox-validation into development

Conflicts:
	application.rb
	example.rb
	report/report_persistance.rb

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/validation_db.rb b/lib/validation_db.rb
index 1152abf..7afab90 100644
--- a/lib/validation_db.rb
+++ b/lib/validation_db.rb
@@ -6,11 +6,11 @@ require "lib/merge.rb"
 
 unless ActiveRecord::Base.connected?
   ActiveRecord::Base.establish_connection(  
-     :adapter => @@config[:database][:adapter],
-     :host => @@config[:database][:host],
-     :database => @@config[:database][:database],
-     :username => @@config[:database][:username],
-     :password => @@config[:database][:password]
+     :adapter => CONFIG[:database][:adapter],
+     :host => CONFIG[:database][:host],
+     :database => CONFIG[:database][:database],
+     :username => CONFIG[:database][:username],
+     :password => CONFIG[:database][:password]
   )
   ActiveRecord::Base.logger = Logger.new("/dev/null")
 end