diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-27 15:56:16 -0300 |
| commit | d395391e1dfae4531671fbb09911e6b9418474ba (patch) | |
| tree | 65d679e11c15de32c18a4303d6dcb9f88f2a0925 /actionpack/lib/action_dispatch | |
| parent | 286f47f3b034db4550110b9a0f9ff48dda29e807 (diff) | |
| parent | c10396b1426fcddea35d88fe865846b8aaab5de4 (diff) | |
| download | rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.gz rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.bz2 rails-d395391e1dfae4531671fbb09911e6b9418474ba.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/stack.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 547a2d2062..9cfd6956d0 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -1,3 +1,5 @@ +require "active_support/core_ext/hash/keys" + module ActionDispatch module Session # This cookie-based session store is the Rails default. Sessions typically diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb index ade2d6f05e..4f71ea6165 100644 --- a/actionpack/lib/action_dispatch/middleware/stack.rb +++ b/actionpack/lib/action_dispatch/middleware/stack.rb @@ -27,10 +27,10 @@ module ActionDispatch end def klass - if @klass.respond_to?(:call) - @klass.call - elsif @klass.is_a?(Class) + if @klass.respond_to?(:new) @klass + elsif @klass.respond_to?(:call) + @klass.call else @klass.to_s.constantize end |