aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-06 13:11:29 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-06 13:11:29 -0800
commit640bec511134be317e6a5b84c6123e6a7c3a80bd (patch)
treebb96f77e28cf697c3e6ee10c65b70e74c8cd349e /actionpack/lib
parenta911d74a5419655c0f0c4505bf2740cad665689f (diff)
parent344364990436d9fcb7e77d5deb1beeb9c34a2b85 (diff)
downloadrails-640bec511134be317e6a5b84c6123e6a7c3a80bd.tar.gz
rails-640bec511134be317e6a5b84c6123e6a7c3a80bd.tar.bz2
rails-640bec511134be317e6a5b84c6123e6a7c3a80bd.zip
Merge pull request #8132 from bquorning/permitted_is_sticky_on_slice
Permitted should be sticky on #slice
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index bd0bcd23ff..da640502a2 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -259,7 +259,9 @@ module ActionController
# params.slice(:a, :b) # => {"a"=>1, "b"=>2}
# params.slice(:d) # => {}
def slice(*keys)
- self.class.new(super)
+ self.class.new(super).tap do |new_instance|
+ new_instance.instance_variable_set :@permitted, @permitted
+ end
end
# Returns an exact copy of the <tt>ActionController::Parameters</tt>