diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-04-30 13:45:12 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-04-30 13:45:12 -0500 |
commit | ba9887c9c02a3671c3d1d893cbee9f360ea2df2d (patch) | |
tree | 5b0043d673369aea8b31fa1973864df80d589373 /actionpack/lib | |
parent | 7b3b7cb2ab1ccf96d4c8a1bafd87dbfbd2ac8c84 (diff) | |
download | rails-ba9887c9c02a3671c3d1d893cbee9f360ea2df2d.tar.gz rails-ba9887c9c02a3671c3d1d893cbee9f360ea2df2d.tar.bz2 rails-ba9887c9c02a3671c3d1d893cbee9f360ea2df2d.zip |
Switch to action_dispatch rack namespace
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 2 | ||||
-rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/params_parser.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb index 16a8f66bc4..a2bb9afaa5 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -109,7 +109,7 @@ module ActionController #:nodoc: end def recycle! - @env["action_controller.request.request_parameters"] = {} + @env["action_dispatch.request.request_parameters"] = {} self.query_parameters = {} self.path_parameters = {} @headers, @request_method, @accepts, @content_type = nil, nil, nil, nil diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 2602b344ca..9f0361a874 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -437,13 +437,13 @@ EOM # Override Rack's GET method to support indifferent access def GET - @env["action_controller.request.query_parameters"] ||= normalize_parameters(super) + @env["action_dispatch.request.query_parameters"] ||= normalize_parameters(super) end alias_method :query_parameters, :GET # Override Rack's POST method to support indifferent access def POST - @env["action_controller.request.request_parameters"] ||= normalize_parameters(super) + @env["action_dispatch.request.request_parameters"] ||= normalize_parameters(super) end alias_method :request_parameters, :POST diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb index abaee2829e..58d527a6e7 100644 --- a/actionpack/lib/action_dispatch/middleware/params_parser.rb +++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb @@ -11,7 +11,7 @@ module ActionDispatch def call(env) if params = parse_formatted_parameters(env) - env["action_controller.request.request_parameters"] = params + env["action_dispatch.request.request_parameters"] = params end @app.call(env) |