diff options
| author | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
| commit | 0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2 (patch) | |
| tree | 1a782151632dd80c8a18c3960536bdf8643debe3 /actionpack/lib/action_controller/session/cookie_store.rb | |
| parent | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (diff) | |
| parent | 229eedfda87a7706dbb5e3e51af8707b3adae375 (diff) | |
| download | rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.gz rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.bz2 rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/session/cookie_store.rb')
| -rw-r--r-- | actionpack/lib/action_controller/session/cookie_store.rb | 2 |
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 b477c1f7da..5bf7503f04 100644 --- a/actionpack/lib/action_controller/session/cookie_store.rb +++ b/actionpack/lib/action_controller/session/cookie_store.rb @@ -129,7 +129,7 @@ class CGI::Session::CookieStore private # Marshal a session hash into safe cookie data. Include an integrity hash. def marshal(session) - data = ActiveSupport::Base64.encode64(Marshal.dump(session)).chop + data = ActiveSupport::Base64.encode64s(Marshal.dump(session)) "#{data}--#{generate_digest(data)}" end |