diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
| commit | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (patch) | |
| tree | 7e9cab343139c79acc36715f4f24c579a207fbc6 /actionpack/lib/action_dispatch/middleware | |
| parent | 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.gz rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.bz2 rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index 03761b10bd..a8768633cc 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -45,6 +45,7 @@ module ActionDispatch ActiveSupport::Deprecation.warn('use replace instead', caller) replace({}) else + load! unless @loaded super(hash.stringify_keys) end end @@ -54,6 +55,7 @@ module ActionDispatch ActiveSupport::Deprecation.warn('use clear instead', caller) clear else + load! unless @loaded super(key.to_s) end end |