diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-29 09:10:01 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-29 09:10:01 +0200 |
| commit | 0f0bdaea7bf46c316ee63a9a66c8668354f142f2 (patch) | |
| tree | 6aa817deafc49b5e89061d8b04a33539752c7623 /activerecord/lib | |
| parent | d69949ed0d63ba19051a24cba992bd4655d0f5be (diff) | |
| download | rails-0f0bdaea7bf46c316ee63a9a66c8668354f142f2.tar.gz rails-0f0bdaea7bf46c316ee63a9a66c8668354f142f2.tar.bz2 rails-0f0bdaea7bf46c316ee63a9a66c8668354f142f2.zip | |
Revert "Avoid uneeded queries in session stores if sid is not given."
First step to merge Rails and Rack session stores. Rack always expects to receive the SID since it may have different behavior if the SID is nil.
This reverts commit e210895ba95e498b9debbf43a3e5ae588bca81f0.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/session_store.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb index 766e63edc7..becde0fbfd 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -293,6 +293,7 @@ module ActiveRecord private def get_session(env, sid) Base.silence do + sid ||= generate_sid session = find_session(sid) env[SESSION_RECORD_KEY] = session [sid, session.data] |