diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cookies.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c73aa707bc..5b413108c1 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added that deleting a cookie should not just set it to an empty string but also instantly expire it #1118 [todd@robotcoop.com] + * Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and AssetTagHelper#stylesheet_path #1110 [Larry Halff] * Fixed url_for(nil) in functional tests #1116 [Alisdair McDiarmid] diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index b82aa5ee08..81f176ad32 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -54,9 +54,10 @@ module ActionController #:nodoc: set_cookie(options) end - # Removes the cookie on the client machine by setting the value to an empty string. + # Removes the cookie on the client machine by setting the value to an empty string + # and setting its expiration date into the past def delete(name) - set_cookie("name" => name.to_s, "value" => "") + set_cookie("name" => name.to_s, "value" => "", "expires" => Time.at(0)) end private |