aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2014-12-24 07:09:10 -0700
committerSean Griffin <sean@seantheprogrammer.com>2014-12-24 07:09:10 -0700
commit199390f33713fae8ae29c441f8d233832ba5cc20 (patch)
tree48082952ad29d09a025a970b36394b824346f642
parent5a2d85be4dc69b7570dd5eb1daba522cb2376f1f (diff)
parent7b2728cac1bebed0cf6f1a4122859790b18abc9f (diff)
downloadrails-199390f33713fae8ae29c441f8d233832ba5cc20.tar.gz
rails-199390f33713fae8ae29c441f8d233832ba5cc20.tar.bz2
rails-199390f33713fae8ae29c441f8d233832ba5cc20.zip
Merge pull request #18180 from vipulnsward/remove-unnecessary-name-passing
Removed unused parameter to cookie serialize method
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 93d1d33f78..8d3ce24612 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -410,7 +410,7 @@ module ActionDispatch
@options[:serializer] == :hybrid && value.start_with?(MARSHAL_SIGNATURE)
end
- def serialize(name, value)
+ def serialize(value)
serializer.dump(value)
end
@@ -463,9 +463,9 @@ module ActionDispatch
def []=(name, options)
if options.is_a?(Hash)
options.symbolize_keys!
- options[:value] = @verifier.generate(serialize(name, options[:value]))
+ options[:value] = @verifier.generate(serialize(options[:value]))
else
- options = { :value => @verifier.generate(serialize(name, options)) }
+ options = { :value => @verifier.generate(serialize(options)) }
end
raise CookieOverflow if options[:value].bytesize > MAX_COOKIE_SIZE
@@ -524,7 +524,7 @@ module ActionDispatch
options = { :value => options }
end
- options[:value] = @encryptor.encrypt_and_sign(serialize(name, options[:value]))
+ options[:value] = @encryptor.encrypt_and_sign(serialize(options[:value]))
raise CookieOverflow if options[:value].bytesize > MAX_COOKIE_SIZE
@parent_jar[name] = options