diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
| commit | 991d1bc200d6fdc379bc83610bc92a4e220c669e (patch) | |
| tree | 84ace4c9c117ba7bc82824dbddf15485a9305bd2 /actionpack/lib/action_controller | |
| parent | 0cf4662ec589813c4fdc22de3398730cab05c5ed (diff) | |
| parent | 9cd50e7752650a3d6bf8545b51d50619d6e70c0b (diff) | |
| download | rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.gz rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.bz2 rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/session_management.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb index ffce8e1bd1..654aa08cd3 100644 --- a/actionpack/lib/action_controller/metal/session_management.rb +++ b/actionpack/lib/action_controller/metal/session_management.rb @@ -16,7 +16,7 @@ module ActionController #:nodoc: self.session_store = ActiveRecord::SessionStore else @@session_store = store.is_a?(Symbol) ? - Session.const_get(store.to_s.camelize) : + ActionDispatch::Session.const_get(store.to_s.camelize) : store end end |