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 d31ef1b9c109244d1610258598b4e8a1b9053d3f..0610d486c80968ff115d298d5c74c13978bfef02 100644 (file)
--- a/vendor/plugins/file_column/init.rb
+++ b/vendor/plugins/file_column/init.rb
@@ -8,6 +8,11 @@ require 'file_column_helper'
 require 'validations'
 require 'test_case'
 
-ActiveRecord::Base.send(:include, FileColumn)
-ActionView::Base.send(:include, FileColumnHelper)
-ActiveRecord::Base.send(:include, FileColumn::Validations)
\ No newline at end of file
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.send(:include, FileColumn)
+  ActiveRecord::Base.send(:include, FileColumn::Validations)
+end
+
+if defined?(ActionView::Base)
+  ActionView::Base.send(:include, FileColumnHelper)
+end