aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorBlueHotDog <dannifriedland@gmail.com>2013-08-30 12:53:03 +0300
committerBlueHotDog <dannifriedland@gmail.com>2013-10-09 12:36:26 +0300
commit8642c2aadc94b6763290711384c265289b02faaa (patch)
tree0dcbcfc75a2d3b40fb08cddd27808e865dfe46e0 /actionpack/lib
parent941516dabcc5fd02eb736f457197bd115c85f2fb (diff)
downloadrails-8642c2aadc94b6763290711384c265289b02faaa.tar.gz
rails-8642c2aadc94b6763290711384c265289b02faaa.tar.bz2
rails-8642c2aadc94b6763290711384c265289b02faaa.zip
Fixing repond_with working directly on the options hash
This fixes an issue where the respond_with worked directly with the given options hash, so that if a user relied on it after calling respond_with, the hash wouldn't be the same. Fixes #12029
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 66dabd821f..a072fce1a1 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -326,6 +326,7 @@ module ActionController #:nodoc:
if collector = retrieve_collector_from_mimes(&block)
options = resources.size == 1 ? {} : resources.extract_options!
+ options = options.clone
options[:default_response] = collector.response
(options.delete(:responder) || self.class.responder).call(self, resources, options)
end