1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Stop messing up with instance variables, use protected as it was meant for

This commit is contained in:
Carlos Antonio da Silva 2013-08-27 23:33:49 -03:00
parent 1297d223b4
commit 01bfd15a26

View file

@ -298,7 +298,7 @@ module ActionController
# params.slice(:d) # => {}
def slice(*keys)
self.class.new(super).tap do |new_instance|
new_instance.instance_variable_set :@permitted, @permitted
new_instance.permitted = @permitted
end
end
@ -312,10 +312,15 @@ module ActionController
# copy_params.permitted? # => true
def dup
super.tap do |duplicate|
duplicate.instance_variable_set :@permitted, @permitted
duplicate.permitted = @permitted
end
end
protected
def permitted=(new_permitted)
@permitted = new_permitted
end
private
def convert_hashes_to_parameters(key, value)
if value.is_a?(Parameters) || !value.is_a?(Hash)