diff options
author | wycats <wycats@gmail.com> | 2010-06-19 08:19:00 -0700 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-06-19 08:19:15 -0700 |
commit | f368b21cb6e45268359c0f0b8beda175e3b40eae (patch) | |
tree | 90ca8f8837e0f497dd4d995d773311fcb619af6a /actionpack/lib | |
parent | 4bfff05f37b8416496d25a045c0e1c38368f1e31 (diff) | |
download | rails-f368b21cb6e45268359c0f0b8beda175e3b40eae.tar.gz rails-f368b21cb6e45268359c0f0b8beda175e3b40eae.tar.bz2 rails-f368b21cb6e45268359c0f0b8beda175e3b40eae.zip |
Remove a relic of #request being in RackDelegation
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal.rb | 11 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 775a5002e2..159d1f0748 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -52,8 +52,7 @@ module ActionController class Metal < AbstractController::Base abstract! - # :api: public - attr_internal :params, :env + attr_internal :env # Returns the last part of the controller's name, underscored, without the ending # "Controller". For instance, MyApp::MyPostsController would return "my_posts" for @@ -85,6 +84,14 @@ module ActionController super end + def params + @_params ||= request.parameters + end + + def params=(val) + @_params = val + end + # Basic implementations for content_type=, location=, and headers are # provided to reduce the dependency on the RackDelegation module # in Renderer and Redirector. diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index 508ea6e2b7..544b4989c7 100644 --- a/actionpack/lib/action_controller/metal/rack_delegation.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -14,10 +14,6 @@ module ActionController super(action, request) end - def params - @_params ||= @_request.parameters - end - def response_body=(body) response.body = body if response super |