Merge branch 'master' into openstreetbugs

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

diff --git a/vendor/plugins/file_column/init.rb b/vendor/plugins/file_column/init.rb
index 6ecbba5f6726c0c13873a057f08c762aa6e7c10f..0610d486c80968ff115d298d5c74c13978bfef02 100644 (file)
--- a/vendor/plugins/file_column/init.rb
+++ b/vendor/plugins/file_column/init.rb
@@ -8,7 +8,7 @@ require 'file_column_helper'
 require 'validations'
 require 'test_case'
 
-if defined?(ActionRecord::Base)
+if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send(:include, FileColumn)
   ActiveRecord::Base.send(:include, FileColumn::Validations)
 end