Merge branch 'master' into openid

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

diff --git a/vendor/plugins/validates_email_format_of/rails/init.rb b/vendor/plugins/validates_email_format_of/rails/init.rb
index bf4d5e80a53993a081a917ac71c40dbd0992594a..bf0e943700f35fabe542152db0d37f969269b539 100644 (file)
--- a/vendor/plugins/validates_email_format_of/rails/init.rb
+++ b/vendor/plugins/validates_email_format_of/rails/init.rb
@@ -1,3 +1,3 @@
-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)
   require 'validates_email_format_of'
 end