Merge branch 'master' into openid

[rails.git] / vendor / plugins / deadlock_retry / init.rb

diff --git a/vendor/plugins/deadlock_retry/init.rb b/vendor/plugins/deadlock_retry/init.rb
index e090f68aff88265c275c6b5d6df1270b620e01af..2d7c5f36e0246244b40a16b37a9fe179415dd5f9 100644 (file)
--- a/vendor/plugins/deadlock_retry/init.rb
+++ b/vendor/plugins/deadlock_retry/init.rb
@@ -1,2 +1,5 @@
 require 'deadlock_retry'
-ActiveRecord::Base.send :include, DeadlockRetry
+
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.send :include, DeadlockRetry
+end