Merge pull request #346 from cwoodcox/rails-4/attr_accessible

only use attr_accessible if it's supported
mbleigh · Apr 20, 2013 · 5e72269 · 5e72269
2 parents 2fda8f1 + cda027d
commit 5e72269
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/acts_as_taggable_on/tag.rb b/lib/acts_as_taggable_on/tag.rb
@@ -2,7 +2,7 @@ module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
     include ActsAsTaggableOn::Utils
 
-    attr_accessible :name
+    attr_accessible :name if defined?(ActiveModel::MassAssignmentSecurity)
 
     ### ASSOCIATIONS:
 

diff --git a/lib/acts_as_taggable_on/tagging.rb b/lib/acts_as_taggable_on/tagging.rb
@@ -8,7 +8,7 @@ class Tagging < ::ActiveRecord::Base #:nodoc:
                     :taggable_id,
                     :tagger,
                     :tagger_type,
-                    :tagger_id
+                    :tagger_id if defined?(ActiveModel::MassAssignmentSecurity)
 
     belongs_to :tag, :class_name => 'ActsAsTaggableOn::Tag'
     belongs_to :taggable, :polymorphic => true
@@ -31,4 +31,4 @@ def remove_unused_tags
       end
     end
   end
-end
+end