diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 14:17:03 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 15:55:56 -0700 |
| commit | d4838fdcb2b311a01329d9994752894e3d308719 (patch) | |
| tree | 872171ba3ec9cae04244423a7c7db50610d9873a /actionpack | |
| parent | fecfd61c227376d8d07f9e4ea638df496c2b08dc (diff) | |
| download | rails-d4838fdcb2b311a01329d9994752894e3d308719.tar.gz rails-d4838fdcb2b311a01329d9994752894e3d308719.tar.bz2 rails-d4838fdcb2b311a01329d9994752894e3d308719.zip | |
make sure the superclass matches so load order does not matter
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 2c0c31de9d..de9c55d96c 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -2,7 +2,7 @@ require 'active_support/core_ext/object/blank' require 'active_support/core_ext/hash/keys' module ActionDispatch - class Request + class Request < Rack::Request def cookie_jar env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self) end diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index bc68615be7..17776c2356 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -1,5 +1,5 @@ module ActionDispatch - class Request + class Request < Rack::Request # Access the contents of the flash. Use <tt>flash["notice"]</tt> to # read a notice you put there or <tt>flash["notice"] = "hello"</tt> # to put a new one. |