0
@@ -628,7 +628,7 @@ module ActiveRecord #:nodoc:
0
       #
0
       # To start from an all-closed default and enable attributes as needed, have a look at attr_accessible.
0
       def attr_protected(*attributes)
0
-        write_inheritable_array("attr_protected", attributes - (protected_attributes || []))
0
+        write_inheritable_attribute("attr_protected", Set.new(attributes.map(&:to_s)) + (protected_attributes || []))
0
       end
0
 
0
       # Returns an array of all the attributes that have been protected from mass-assignment.
0
@@ -662,7 +662,7 @@ module ActiveRecord #:nodoc:
0
       #   customer.credit_rating = "Average"
0
       #   customer.credit_rating # => "Average"
0
       def attr_accessible(*attributes)
0
-        write_inheritable_array("attr_accessible", attributes - (accessible_attributes || []))
0
+        write_inheritable_attribute("attr_accessible", Set.new(attributes.map(&:to_s)) + (accessible_attributes || []))
0
       end
0
 
0
       # Returns an array of all the attributes that have been made accessible to mass-assignment.
0
@@ -2084,9 +2084,9 @@ module ActiveRecord #:nodoc:
0
           if self.class.accessible_attributes.nil? && self.class.protected_attributes.nil?
0
             attributes.reject { |key, value| attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
0
           elsif self.class.protected_attributes.nil?
0
-            attributes.reject { |key, value| !self.class.accessible_attributes.include?(key.gsub(/\(.+/, "").intern) || attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
0
+            attributes.reject { |key, value| !self.class.accessible_attributes.include?(key.gsub(/\(.+/, "")) || attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
0
           elsif self.class.accessible_attributes.nil?
0
-            attributes.reject { |key, value| self.class.protected_attributes.include?(key.gsub(/\(.+/,"").intern) || attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
0
+            attributes.reject { |key, value| self.class.protected_attributes.include?(key.gsub(/\(.+/,"")) || attributes_protected_by_default.include?(key.gsub(/\(.+/, "")) }
0
           else
0
             raise "Declare either attr_protected or attr_accessible for #{self.class}, but not both."
0
           end

0
@@ -40,6 +40,11 @@ class LooseDescendant < LoosePerson
0
   attr_protected :phone_number
0
 end
0
 
0
+class LooseDescendantSecond< LoosePerson
0
+  attr_protected :phone_number
0
+  attr_protected :name
0
+end
0
+
0
 class TightPerson < ActiveRecord::Base
0
   self.table_name = 'people'
0
   attr_accessible :name, :address
0
@@ -843,16 +848,19 @@ class BasicsTest < Test::Unit::TestCase
0
   
0
   def test_mass_assignment_protection_inheritance
0
     assert_nil LoosePerson.accessible_attributes
0
-    assert_equal [ :credit_rating, :administrator ], LoosePerson.protected_attributes
0
+    assert_equal Set.new([ 'credit_rating', 'administrator' ]), LoosePerson.protected_attributes
0
 
0
     assert_nil LooseDescendant.accessible_attributes
0
-    assert_equal [ :credit_rating, :administrator, :phone_number  ], LooseDescendant.protected_attributes
0
+    assert_equal Set.new([ 'credit_rating', 'administrator', 'phone_number' ]), LooseDescendant.protected_attributes
0
+
0
+    assert_nil LooseDescendantSecond.accessible_attributes
0
+    assert_equal Set.new([ 'credit_rating', 'administrator', 'phone_number', 'name' ]), LooseDescendantSecond.protected_attributes, 'Running attr_protected twice in one class should merge the protections'
0
 
0
     assert_nil TightPerson.protected_attributes
0
-    assert_equal [ :name, :address ], TightPerson.accessible_attributes
0
+    assert_equal Set.new([ 'name', 'address' ]), TightPerson.accessible_attributes
0
 
0
     assert_nil TightDescendant.protected_attributes
0
-    assert_equal [ :name, :address, :phone_number  ], TightDescendant.accessible_attributes
0
+    assert_equal Set.new([ 'name', 'address', 'phone_number' ]), TightDescendant.accessible_attributes
0
   end
0
   
0
   def test_readonly_attributes