Merge branch 'master' into openid

[rails.git] / config / initializers / abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 9042823c28ccd22995be969739a7d9cd93f19ad1..d96742ee50e9494e5e2759b145e46c6340ff5ad6 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -1,4 +1,4 @@
-if defined?(ActionRecord::ConnectionAdaptors::AbstractAdaptor)
+if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdaptor)
   module ActiveRecord
     module ConnectionAdapters
       class AbstractAdapter