aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-07 08:12:03 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-07 08:12:03 +0000
commit7324444344b428727e2fcfed674dd818ef57b1ad (patch)
tree3575c3cae38cebcc9f1b73eddbfbf7a855dfaf5b /actionpack/lib
parent3600536b04ca7e902c5ad594175feb451261cc81 (diff)
downloadrails-7324444344b428727e2fcfed674dd818ef57b1ad.tar.gz
rails-7324444344b428727e2fcfed674dd818ef57b1ad.tar.bz2
rails-7324444344b428727e2fcfed674dd818ef57b1ad.zip
Ruby 1.9 compat: cookie store delete sets nil value instead of empty string
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/session/cookie_store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb
index 0a2a91f01e..5e5ef1bfb0 100644
--- a/actionpack/lib/action_controller/session/cookie_store.rb
+++ b/actionpack/lib/action_controller/session/cookie_store.rb
@@ -117,7 +117,7 @@ class CGI::Session::CookieStore
def delete
@data = nil
clear_old_cookie_value
- write_cookie('value' => '', 'expires' => 1.year.ago)
+ write_cookie('value' => nil, 'expires' => 1.year.ago)
end
# Generate the HMAC keyed message digest. Uses SHA1 by default.