diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-08 16:36:26 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-08 16:36:26 +0000 |
| commit | 37f90e0f6b39e6d0cf0463e5fe6799aa6a1c922b (patch) | |
| tree | 5f96d65697c1b3fa883bfb2240fc143400e665af | |
| parent | c18961f185cb593873b72d1ffa67c640b2cd126f (diff) | |
| download | rails-37f90e0f6b39e6d0cf0463e5fe6799aa6a1c922b.tar.gz rails-37f90e0f6b39e6d0cf0463e5fe6799aa6a1c922b.tar.bz2 rails-37f90e0f6b39e6d0cf0463e5fe6799aa6a1c922b.zip | |
r2932@asus: jeremy | 2005-07-08 14:21:36 -0700
Silence find_by_session_id also.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1771 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_controller/session/active_record_store.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index a481616615..779ad9dcba 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -27,7 +27,7 @@ class CGI # initialize(hash_of_session_id_and_data) # attr_reader :session_id # attr_accessor :data - # save! + # save # destroy # # The fast SqlBypass class is a generic SQL session store. You may @@ -198,7 +198,7 @@ class CGI @data end - def save! + def save marshaled_data = self.class.marshal(data) if @new_record @new_record = false @@ -240,7 +240,7 @@ class CGI # Find or instantiate a session given a CGI::Session. def initialize(session, option = nil) session_id = session.session_id - unless @session = @@session_class.find_by_session_id(session_id) + unless @session = ActiveRecord::Base.silence { @@session_class.find_by_session_id(session_id) } unless session.new_session raise CGI::Session::NoSession, 'uninitialized session' end @@ -258,7 +258,7 @@ class CGI # Save session store. def update if @session - ActiveRecord::Base.silence { @session.save! } + ActiveRecord::Base.silence { @session.save } end end |