aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorJeffrey Hardy <packagethief@gmail.com>2009-10-14 00:26:53 -0400
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-14 11:50:51 -0700
commita8dc9fd27b845193fd209a249e084f993a10c19d (patch)
treebf82adb1476ae733e8a0b3a028229a6fb69cc127 /actionpack/lib/action_controller/metal
parentff8be66f249d49e82c8e1d04cb8cfbbc128deabe (diff)
downloadrails-a8dc9fd27b845193fd209a249e084f993a10c19d.tar.gz
rails-a8dc9fd27b845193fd209a249e084f993a10c19d.tar.bz2
rails-a8dc9fd27b845193fd209a249e084f993a10c19d.zip
CookieJar#delete should return the key's value, consistent with a Hash
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/cookies.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb
index d4806623c3..c328db8beb 100644
--- a/actionpack/lib/action_controller/metal/cookies.rb
+++ b/actionpack/lib/action_controller/metal/cookies.rb
@@ -87,8 +87,9 @@ module ActionController #:nodoc:
def delete(key, options = {})
options.symbolize_keys!
options[:path] = "/" unless options.has_key?(:path)
- super(key.to_s)
+ value = super(key.to_s)
@controller.response.delete_cookie(key, options)
+ value
end
end
end